Parcourir la source

Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

zhangxin il y a 2 mois
Parent
commit
535e31f4c4

+ 74 - 4
components/soundRecorder/soundRecorder.vue

@@ -1,7 +1,12 @@
1 1
 <template>
2 2
     <view class="sound-recorder">
3
-        <!-- <view>{{ data }}</view> -->
4
-        <audio :src="data.fileUrl" controls></audio>
3
+        <view class="top-text">{{ topText }}</view>
4
+        <view class="file-name">{{ dataInner.fileName }}</view>
5
+        <view class="call-history">{{ callHistory }}</view>
6
+        <audio :src="dataInner.fileUrl" controls></audio>
7
+        <view @click="handleDelete">
8
+            <u-icon class="delectIcon" name="trash" size="22"></u-icon>
9
+        </view>
5 10
     </view>
6 11
 </template>
7 12
 
@@ -10,13 +15,78 @@ export default {
10 15
     props: {
11 16
         data: {
12 17
             type: Object,
13
-            default: {}
18
+            default: () => ({})
14 19
         }
15 20
     },
16 21
     data() {
17 22
         return {
23
+            dataInner: {}
18 24
         }
19 25
     },
26
+    watch: {
27
+        data: {
28
+            deep: true,
29
+            immediate: true,
30
+            handler(newVal) {
31
+                this.dataInner = { ...newVal }
32
+            }
33
+        }
34
+    },
35
+    computed: {
36
+        topText() {
37
+            return `${this.dataInner.createTime}号码(${this.dataInner.caller})上传录音`
38
+        },
39
+        callHistory() {
40
+            return `${this.dataInner.caller} 打给 ${this.dataInner.callee}`
41
+        }
42
+    },
43
+    methods: {
44
+        handleDelete() {
45
+            console.log('点击了删除录音的按钮')
46
+            // this.$emit('delete', this.dataInner)
47
+        }
48
+    }
49
+
20 50
 }
21 51
 </script>
22
-<style lang="scss" scoped></style>
52
+<style lang="scss" scoped>
53
+.sound-recorder {
54
+    background: #ffffff;
55
+    border-radius: 20rpx;
56
+    box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.08);
57
+    padding: 32rpx;
58
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
59
+    border: 2rpx solid #f0f0f0;
60
+    position: relative;
61
+    margin-bottom: 10rpx;
62
+
63
+    .top-text {
64
+        font-size: 20rpx;
65
+        color: #888;
66
+        line-height: 1.4;
67
+    }
68
+
69
+    .call-history {
70
+        font-size: 30rpx;
71
+        color: #333;
72
+        font-weight: 500;
73
+        margin-bottom: 20rpx;
74
+        line-height: 1.5;
75
+    }
76
+
77
+    .file-name {
78
+        font-size: 20rpx;
79
+        color: #666;
80
+        line-height: 1.4;
81
+        word-break: break-all;
82
+    }
83
+
84
+
85
+    .delectIcon {
86
+        position: absolute;
87
+        right: 32rpx;
88
+        top: 32rpx;
89
+        z-index: 1;
90
+    }
91
+}
92
+</style>

+ 74 - 73
pages/clue/scss/clue.scss

@@ -1,7 +1,7 @@
1
-.suspension_button{
1
+.suspension_button {
2 2
 	position: fixed;
3 3
 	bottom: 200rpx;
4
-	right: 100rpx;
4
+	left: 50rpx;
5 5
 	border-radius: 50%;
6 6
 	width: 100rpx;
7 7
 	line-height: 100rpx;
@@ -10,94 +10,95 @@
10 10
 	text-align: center;
11 11
 	background-color: #4c8afe;
12 12
 }
13
+
13 14
 .clueDetail_tabber {
14
-		::v-deep .u-tabbar__content {
15
-			background: #108cff;
16
-			border-top-right-radius: 10px;
17
-			border-top-left-radius: 10px;
18
-		}
15
+	::v-deep .u-tabbar__content {
16
+		background: #108cff;
17
+		border-top-right-radius: 10px;
18
+		border-top-left-radius: 10px;
19 19
 	}
20
+}
20 21
 
21
-	.clue_state_wrap {
22
-		width: 690rpx;
23
-		padding: 0 30rpx;
24
-		margin-top: 20rpx;
25
-		display: flex;
22
+.clue_state_wrap {
23
+	width: 690rpx;
24
+	padding: 0 30rpx;
25
+	margin-top: 20rpx;
26
+	display: flex;
26 27
 
27
-		.clue_state_list {
28
-			display: flex;
28
+	.clue_state_list {
29
+		display: flex;
29 30
 
30
-			.clue_state_item {
31
-				font-size: 30rpx;
32
-				display: inline-flex;
33
-				/* 关键改动:改为行内弹性盒子 */
34
-				align-items: center;
35
-				/* 垂直居中 */
36
-				background: #fff;
37
-				margin-right: 30rpx;
38
-				padding: 8rpx 16rpx;
39
-				/* 增加内边距 */
40
-				white-space: nowrap;
41
-				/* 关键:禁止文本换行 */
42
-				border-radius: 6rpx;
31
+		.clue_state_item {
32
+			font-size: 30rpx;
33
+			display: inline-flex;
34
+			/* 关键改动:改为行内弹性盒子 */
35
+			align-items: center;
36
+			/* 垂直居中 */
37
+			background: #fff;
38
+			margin-right: 30rpx;
39
+			padding: 8rpx 16rpx;
40
+			/* 增加内边距 */
41
+			white-space: nowrap;
42
+			/* 关键:禁止文本换行 */
43
+			border-radius: 6rpx;
43 44
 
44
-				&.active {
45
-					color: #fff;
46
-					background: #4c8afe;
47
-				}
45
+			&.active {
46
+				color: #fff;
47
+				background: #4c8afe;
48 48
 			}
49 49
 		}
50 50
 	}
51
+}
51 52
 
52
-	.clueTagsSelect {
53
-		height: 0;
54
-		overflow: hidden;
55
-	}
53
+.clueTagsSelect {
54
+	height: 0;
55
+	overflow: hidden;
56
+}
56 57
 
57
-	.queryParams_wrap {
58
-		display: flex;
59
-		background: #fff;
60
-		padding: 14px 0;
58
+.queryParams_wrap {
59
+	display: flex;
60
+	background: #fff;
61
+	padding: 14px 0;
61 62
 
62
-		.query,
63
-		.sort {
64
-			display: flex;
65
-			align-items: center;
66
-			justify-content: center;
67
-			flex: 1;
68
-			font-size: 16px;
69
-			font-weight: 700;
70
-			color: #202020;
71
-		}
63
+	.query,
64
+	.sort {
65
+		display: flex;
66
+		align-items: center;
67
+		justify-content: center;
68
+		flex: 1;
69
+		font-size: 16px;
70
+		font-weight: 700;
71
+		color: #202020;
72 72
 	}
73
+}
73 74
 
74
-	#navbar_center_wrap {
75
-		width: 320rpx;
76
-		margin: auto;
77
-		padding: 15px;
78
-		background-color: #fff;
79
-	}
75
+#navbar_center_wrap {
76
+	width: 320rpx;
77
+	margin: auto;
78
+	padding: 15px;
79
+	background-color: #fff;
80
+}
80 81
 
81
-	.post_wrap {
82
-		margin: 10px 0;
83
-	}
82
+.post_wrap {
83
+	margin: 10px 0;
84
+}
84 85
 
85
-	.case_top_wrap {
86
-		background-color: #fff;
87
-		padding: 0px 30rpx 15rpx 30rpx;
88
-		display: flex;
89
-		align-items: center;
90
-		justify-content: space-between;
86
+.case_top_wrap {
87
+	background-color: #fff;
88
+	padding: 0px 30rpx 15rpx 30rpx;
89
+	display: flex;
90
+	align-items: center;
91
+	justify-content: space-between;
91 92
 
92
-		.conditionSelect {
93
-			width: 200rpx;
94
-		}
93
+	.conditionSelect {
94
+		width: 200rpx;
95 95
 	}
96
+}
96 97
 
97
-	.case_wrap {
98
-		padding-bottom: 30px;
98
+.case_wrap {
99
+	padding-bottom: 30px;
99 100
 
100
-		.case_main_wrap {
101
-			padding: 15px;
102
-		}
103
-	}
101
+	.case_main_wrap {
102
+		padding: 15px;
103
+	}
104
+}

+ 3 - 1
pages/orderDetailNew/components/pageFour.vue

@@ -455,7 +455,8 @@ export default {
455 455
                 { label: '是', value: '1' },
456 456
                 { label: '否', value: '2' }
457 457
             ]],
458
-            currentEditItem:''
458
+            currentEditItem: '',
459
+
459 460
         };
460 461
     },
461 462
     mounted() {
@@ -714,6 +715,7 @@ export default {
714 715
         handleSelectOrg(item) {
715 716
             console.log(item.uuid, '当前选择的行的uuid')
716 717
             this.currentEditItem = item.uuid
718
+            console.log(this.currentEditItem, '当前选择的行')
717 719
             // this.showOrgPicker = true
718 720
             this.showPersonPicker = true
719 721
             //把当前的组织赋值给当前的组件

+ 3 - 3
pages/orderDetailNew/components/pageOne.vue

@@ -416,10 +416,10 @@ export default {
416 416
         //获取通话记录
417 417
         async getCallRecords() {
418 418
             console.log('这里是参数', this.currentReceipt.clueId);
419
-            // const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: this.currentReceipt.clueId });
420
-            const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: '1998278069905854466' });
419
+            const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: this.currentReceipt.clueId });
420
+            // const { data } = await uni.$u.api.getCallClueFileByClueId({ clueId: '1998278069905854466' });
421 421
             console.log('通话记录:', data);
422
-            // this.soundRecordList = data;
422
+            this.soundRecordList = data;
423 423
         },
424 424
 
425 425
     },