重构实物图卡片位置并修正文件类型逻辑

pages/orderDetailNew/components/pageOne.vue

@@ -10,21 +10,7 @@
             </u-col>
         </u-row>
 
-        <!-- 实物图卡片 -->
-        <view class="card_wrap">
-            <view class="card-title">实物图</view>
-            <view class="image-upload-container">
-                <view class="image-list">
-                    <view class="image-item" v-for="(item, index) in trueUploadList" :key="'truePic-' + index">
-                        <pic-comp @needPreviewPic='previewImageTrue' :src="item.fileUrl"></pic-comp>
-                        <view class="delete-btn" @click="deleteImage(item)">×</view>
-                    </view>
-                    <view class="upload-btn" @click="uploadImage('truePic', currentReceipt.id)">
-                        <u-icon name="plus" size="40" color="#999"></u-icon>
-                    </view>
-                </view>
-            </view>
-        </view>
+        
 
         <!-- 聊天记录卡片 -->
         <view class="card_wrap">
@@ -59,6 +45,23 @@
             </view>
         </view>
 
+        <!-- 实物图卡片 -->
+        <view class="card_wrap">
+            <view class="card-title">实物图</view>
+            <view class="image-upload-container">
+                <view class="image-list">
+                    <view class="image-item" v-for="(item, index) in trueUploadList" :key="'truePic-' + index">
+                        <pic-comp @needPreviewPic='previewImageTrue' :src="item.fileUrl"></pic-comp>
+                        <view class="delete-btn" @click="deleteImage(item)">×</view>
+                    </view>
+                    <view class="upload-btn" @click="uploadImage('truePic', currentReceipt.id)">
+                        <u-icon name="plus" size="40" color="#999"></u-icon>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+
         <!-- 基本信息卡片 -->
         <view class="info-card">
             <view class="info-card-title">基本信息</view>

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -48,15 +48,15 @@ export default {
                     pageSize: 1000 // 设置一个较大的值以获取所有数据
                 }
                 const response = await uni.$u.api.selectClueFileByDto(params)
-                if (orderFileType == '1') {
+                //聊天记录1，实物图2，细节图3
+                if (orderFileType == '2') {
                     //如果itemBrand里面有逗号的话说明是多个品牌
-
                     if (itemBrand.indexOf(',') != -1) {
                         this.trueUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
                     } else {
                         this.trueUploadList = response.rows
                     }
-                } else if (orderFileType == '2') {
+                } else if (orderFileType == '1') {
                     if (itemBrand.indexOf(',') != -1) {
                         this.chatRecordsUploadList = response.rows.filter(item => item.sourceId == receiptID) || []
                     } else {
@@ -96,8 +96,8 @@ export default {
         async uploadToServer(filePaths, type, receiptID) {
             // 实际的上传逻辑
             try {
-                //实物图的话就是1,聊天记录的话就是2,高清细节图的话就是3
-                let p = type == 'truePic' ? '1' : type == 'chatRecords' ? '2' : type == 'detailImages' ? '3' : ''
+                //聊天记录的话就是1,实物图的话就是2,高清细节图的话就是3
+                let p = type == 'truePic' ? '2' : type == 'chatRecords' ? '1' : type == 'detailImages' ? '3' : ''
                 console.log('当前上传的图片类型是', p)
                 const res = await Promise.all(filePaths.map(filePath => this.uploadFile(filePath, p)));
 
@@ -141,7 +141,7 @@ export default {
         },
         //绑定订单
         async bindOrder(orderFileType, receiptID) {
-            console.log('当前的收单id', receiptID)
+            console.log('当前的收单id', receiptID,'当前的订单文件类型', orderFileType)
             const res = await uni.$u.api.saveClueFile({
                 clueId: this.orderDetail.clueId,//线索id
                 list: this.bindList,

pages/uploadRecord/index.vue

@@ -7,17 +7,17 @@
 		</u-navbar>
 		<view class="form_wrap">
 			<u--form labelPosition="left" labelWidth="80" :model="form" :rules="rules" ref="form" class="form_wrap">
-				
+
 				<u-form-item label="线索id">
-					{{clueDetail && clueDetail.id ? clueDetail.id : "-"}}
+					{{ clueDetail && clueDetail.id ? clueDetail.id : "-" }}
 				</u-form-item>
-				
+
 				<u-form-item label="线索名称">
-					{{clueDetail && clueDetail.name ? clueDetail.name : "-"}}
+					{{ clueDetail && clueDetail.name ? clueDetail.name : "-" }}
 				</u-form-item>
-				
+
 				<u-form-item label="操作人">
-					{{userInfo.nickName}}
+					{{ userInfo.nickName }}
 				</u-form-item>
 
 				<u-form-item label="主叫号码" prop="caller">
@@ -40,14 +40,14 @@
 				</u-form-item>
 			</u--form>
 		</view>
-		
+
 		<!-- 录音确认对话框 -->
 		<u-popup :show="showConfirmDialog" mode="center" :closeable="false" :closeOnClickOverlay="false">
 			<view class="confirm-dialog">
 				<view class="dialog-title">确认录音</view>
 				<view class="dialog-content">
 					<view class="file-info">
-						<view class="file-name">{{selectedFile.fileName}}</view>
+						<view class="file-name">{{ selectedFile.fileName }}</view>
 					</view>
 					<view class="play-section">
 						<audio :src="selectedFile.filePath" controls class="audio-player"></audio>
@@ -59,226 +59,226 @@
 				</view>
 			</view>
 		</u-popup>
-		
+
 		<!-- <drag-button :isDock="true" /> -->
 	</view>
 </template>
 
 <script>
-	export default {
-		computed: {
-			userInfo() {
-				return this.$store.state.user.userInfo;
-			},
-			filelist(){
-				return this.$store.state.call.filelist;
-			},
-			storeForm() {
-				return this.$store.state.call.form;
-			},
+export default {
+	computed: {
+		userInfo() {
+			return this.$store.state.user.userInfo;
 		},
-		data() {
-			return {
-				rules: {
-					'caller': {
-						type: 'string',
-						required: true,
-						message: '请输入内容',
-						trigger: ['blur', 'change']
-					},
-					'callee': {
-						type: 'string',
-						required: true,
-						message: '请输入内容',
-						trigger: ['blur', 'change']
-					},
-					'fileUrl': {
-						type: 'string',
-						required: true,
-						message: '请输入内容',
-						trigger: ['blur', 'change']
-					},
+		filelist() {
+			return this.$store.state.call.filelist;
+		},
+		storeForm() {
+			return this.$store.state.call.form;
+		},
+	},
+	data() {
+		return {
+			rules: {
+				'caller': {
+					type: 'string',
+					required: true,
+					message: '请输入内容',
+					trigger: ['blur', 'change']
 				},
-				form: {
-					clueId: undefined,
-					remark: '',
-					fileUrl : undefined,
-					fileName : undefined,
-					type : '3',
-					list : [],
-					caller : '',
-					callee : ''
+				'callee': {
+					type: 'string',
+					required: true,
+					message: '请输入内容',
+					trigger: ['blur', 'change']
 				},
-				clueDetail : {},
-				// 对话框相关状态
-				showConfirmDialog: false,
-				selectedFile: {
-					filePath: '',
-					fileName: ''
+				'fileUrl': {
+					type: 'string',
+					required: true,
+					message: '请输入内容',
+					trigger: ['blur', 'change']
 				},
-			}
-		},
-		methods: {
-			initFormFromStore() {
-				const storeFormData = this.storeForm;
-				this.form = {
-					...this.form,
-					caller: storeFormData.caller || '',
-					callee: storeFormData.callee || '',
-					fileUrl: storeFormData.fileUrl,
-					fileName: storeFormData.fileName,
-					remark: storeFormData.remark,
-					type: storeFormData.type,
-					list: storeFormData.list
-				};
-				
-				uni.$u.api.getClueMainInfoById({id : this.form.clueId}).then(({data})=>{
-					this.clueDetail = data;
-				})
-				
-				if(!this.form.callee){
-					// 没有准备被叫号码 直接去查线索的telephone
-					this.form.callee = this.clueDetail.telephone;
-				};
-				if(!this.form.caller){
-					// 没有准备主叫号码 直接去尝试获取
-					this.$store.dispatch("call/getUserPhoneNumber").then(phone=>{
-						this.form.caller = phone;
-					})
-				}
-				if(storeFormData.fileUrl){
-					// 初始化带了fileUrl 说明是从监听那边跳转的
-					this.handleFileChange({ filePath : storeFormData.fileUrl , fileName : storeFormData.fileName });
-				}
-				this.$store.dispatch("call/resetForm");
 			},
-			
-			handleFileChange(file){
-				// {
-				    // "filePath": "/storage/emulated/0/Recordings/Record/Call/15099989786 2025-11-11 09-41-57.m4a",
-				    // "fileName": "15099989786 2025-11-11 09-41-57.m4a"
-				// }
-				
-				const {filePath ,  fileName} = file;
-				
-				// 显示确认对话框
-				this.selectedFile = { filePath, fileName };
-				this.showConfirmDialog = true;
+			form: {
+				clueId: undefined,
+				remark: '',
+				fileUrl: undefined,
+				fileName: undefined,
+				type: '3',
+				list: [],
+				caller: '',
+				callee: ''
 			},
-			
-			// 取消确认
-			cancelConfirm() {
-				this.showConfirmDialog = false;
-				this.selectedFile = { filePath: '', fileName: '' };
-				this.form.fileUrl = undefined;
-				this.form.fileName = undefined;
-			},
-			
-			// 确认上传
-			async confirmUpload() {
-				try {
-					// 调用上传接口
-					const result = await uni.$u.api.uploadFile(this.selectedFile.filePath);
-					if (result && result.data) {
-						result.data.remark = this.form.remark;
-						result.data.fileName = result.data.name;
-						result.data.fileUrl = result.data.url;
-						this.form.list = [result.data];
-					}
-					// 设置表单值
-					this.form.fileUrl = this.selectedFile.filePath;
-					this.form.fileName = this.selectedFile.fileName;
-					
-					// 关闭对话框
-					this.showConfirmDialog = false;
-				} catch (error) {
-					uni.hideLoading();
-					console.error('上传失败:', error);
-					uni.$u.toast('上传失败，请重试');
-				}
+			clueDetail: {},
+			// 对话框相关状态
+			showConfirmDialog: false,
+			selectedFile: {
+				filePath: '',
+				fileName: ''
 			},
-			
-			handleNavSaveClick() {
-				if(!this.form.clueId){
-					uni.$u.toast("相关线索id为空");
-				}
-				this.$refs.form.validate().then(async () => {
-					await uni.$u.api.saveClueFile(this.form);
-					uni.$u.toast("保存成功");
-					this.timer = setTimeout(() => {
-						uni.$emit('uploadRecordSuccess');
-						uni.navigateBack();
-						clearTimeout(this.timer);
-					}, 1000)
+		}
+	},
+	methods: {
+		initFormFromStore() {
+			const storeFormData = this.storeForm;
+			this.form = {
+				...this.form,
+				caller: storeFormData.caller || '',
+				callee: storeFormData.callee || '',
+				fileUrl: storeFormData.fileUrl,
+				fileName: storeFormData.fileName,
+				remark: storeFormData.remark,
+				type: storeFormData.type,
+				list: storeFormData.list
+			};
+
+			uni.$u.api.getClueMainInfoById({ id: this.form.clueId }).then(({ data }) => {
+				this.clueDetail = data;
+			})
+
+			if (!this.form.callee) {
+				// 没有准备被叫号码 直接去查线索的telephone
+				this.form.callee = this.clueDetail.telephone;
+			};
+			if (!this.form.caller) {
+				// 没有准备主叫号码 直接去尝试获取
+				this.$store.dispatch("call/getUserPhoneNumber").then(phone => {
+					this.form.caller = phone;
 				})
-			},
+			}
+			if (storeFormData.fileUrl) {
+				// 初始化带了fileUrl 说明是从监听那边跳转的
+				this.handleFileChange({ filePath: storeFormData.fileUrl, fileName: storeFormData.fileName });
+			}
+			this.$store.dispatch("call/resetForm");
 		},
-		onLoad(option) {
-			this.$store.dispatch("call/getFileList");
-			this.form.clueId = option.clueId;
-			this.initFormFromStore();
+
+		handleFileChange(file) {
+			// {
+			// "filePath": "/storage/emulated/0/Recordings/Record/Call/15099989786 2025-11-11 09-41-57.m4a",
+			// "fileName": "15099989786 2025-11-11 09-41-57.m4a"
+			// }
+
+			const { filePath, fileName } = file;
+
+			// 显示确认对话框
+			this.selectedFile = { filePath, fileName };
+			this.showConfirmDialog = true;
 		},
-	}
+
+		// 取消确认
+		cancelConfirm() {
+			this.showConfirmDialog = false;
+			this.selectedFile = { filePath: '', fileName: '' };
+			this.form.fileUrl = undefined;
+			this.form.fileName = undefined;
+		},
+
+		// 确认上传
+		async confirmUpload() {
+			try {
+				// 调用上传接口
+				const result = await uni.$u.api.uploadFile(this.selectedFile.filePath);
+				if (result && result.data) {
+					result.data.remark = this.form.remark;
+					result.data.fileName = result.data.name;
+					result.data.fileUrl = result.data.url;
+					this.form.list = [result.data];
+				}
+				// 设置表单值
+				this.form.fileUrl = this.selectedFile.filePath;
+				this.form.fileName = this.selectedFile.fileName;
+
+				// 关闭对话框
+				this.showConfirmDialog = false;
+			} catch (error) {
+				uni.hideLoading();
+				console.error('上传失败:', error);
+				uni.$u.toast('上传失败，请重试');
+			}
+		},
+
+		handleNavSaveClick() {
+			if (!this.form.clueId) {
+				uni.$u.toast("相关线索id为空");
+			}
+			this.$refs.form.validate().then(async () => {
+				await uni.$u.api.saveClueFile(this.form);
+				uni.$u.toast("保存成功");
+				this.timer = setTimeout(() => {
+					uni.$emit('uploadRecordSuccess');
+					uni.navigateBack();
+					clearTimeout(this.timer);
+				}, 1000)
+			})
+		},
+	},
+	onLoad(option) {
+		this.$store.dispatch("call/getFileList");
+		this.form.clueId = option.clueId;
+		this.initFormFromStore();
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	.form_wrap {
-		background-color: #fff;
-		margin: 20rpx 0;
+.form_wrap {
+	background-color: #fff;
+	margin: 20rpx 0;
 
-		.form_wrap {
-			::v-deep .u-form-item__body {
-				padding: 20rpx 40rpx;
-			}
+	.form_wrap {
+		::v-deep .u-form-item__body {
+			padding: 20rpx 40rpx;
 		}
 	}
-	
-	/* 录音确认对话框样式 */
-	.confirm-dialog {
-		padding: 40rpx;
-		min-width: 500rpx;
-		background: #fff;
-		border-radius: 20rpx;
-		
-		.dialog-title {
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #333;
-			margin-bottom: 40rpx;
-		}
-		
-		.dialog-content {
-			margin-bottom: 40rpx;
-			
-			.file-info {
-				margin-bottom: 30rpx;
-				
-				.file-name {
-					background: #f5f5f5;
-					padding: 20rpx;
-					border-radius: 10rpx;
-					font-size: 28rpx;
-					color: #333;
-					word-break: break-all;
-					text-align: center;
-				}
-			}
-			
-			.play-section {
-				.audio-player {
-					width: 100%;
-				}
+}
+
+/* 录音确认对话框样式 */
+.confirm-dialog {
+	padding: 40rpx;
+	min-width: 500rpx;
+	background: #fff;
+	border-radius: 20rpx;
+
+	.dialog-title {
+		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #333;
+		margin-bottom: 40rpx;
+	}
+
+	.dialog-content {
+		margin-bottom: 40rpx;
+
+		.file-info {
+			margin-bottom: 30rpx;
+
+			.file-name {
+				background: #f5f5f5;
+				padding: 20rpx;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				color: #333;
+				word-break: break-all;
+				text-align: center;
 			}
 		}
-		
-		.dialog-buttons {
-			display: flex;
-			gap: 30rpx;
-			
-			::v-deep .u-button {
-				flex: 1;
+
+		.play-section {
+			.audio-player {
+				width: 100%;
 			}
 		}
 	}
+
+	.dialog-buttons {
+		display: flex;
+		gap: 30rpx;
+
+		::v-deep .u-button {
+			flex: 1;
+		}
+	}
+}
 </style>