APP新增线索增加字段：业务类别、物品类别、线索类别和其他补充调整

pages/addClue/index.vue

@@ -64,6 +64,24 @@
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				
+				<u-form-item label="业务类别" prop="clueBizType" borderBottom>
+					<ld-select :list="clueBizTypeDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择业务类别"
+						v-model="form.clueBizType" :border="false"></ld-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				
+				<u-form-item label="物品类别" prop="clueObjType" borderBottom>
+					<ld-select :list="clueObjTypeDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品类别"
+						v-model="form.clueObjType" :border="false"></ld-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				
+				<u-form-item label="线索类别" prop="clueAdType" borderBottom>
+					<ld-select :list="clueAdTypeDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择线索类别"
+						v-model="form.clueAdType" :border="false"></ld-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				
 				<u-form-item label="年龄" prop="age" borderBottom>
 					<u--input v-model.number="form.age" disabledColor="#ffffff" border="none" placeholder="请输入年龄"></u--input>
 				</u-form-item>
@@ -131,27 +149,39 @@
 
 <script>
 	const columnProps = [
-	  {
-	    prop : "name",
-	    label : "姓名",
-	  },
-	  {
-	    prop : "telephone",
-	    label : "电话",
-	  },
-	  {
-	    prop : "clueOperationName",
-	    label : "运营",
-	  },
-	  {
-	    prop : "appName",
-	    label : "来源",
-	  },
-	  {
-	    prop : "deptName",
-	    label : "归属",
-	  }
-	];
+  {
+    prop : "name",
+    label : "姓名",
+  },
+  {
+    prop : "telephone",
+    label : "电话",
+  },
+  {
+    prop : "clueOperationName",
+    label : "运营",
+  },
+  {
+    prop : "appName",
+    label : "来源",
+  },
+  {
+    prop : "deptName",
+    label : "归属",
+  },
+  {
+    prop : "clueBizType",
+    label : "业务类别",
+  },
+  {
+    prop : "clueObjType",
+    label : "物品类别",
+  },
+  {
+    prop : "clueAdType",
+    label : "线索类别",
+  }
+];
 	import ldSelect from '@/components/ld-select/ld-select.vue'
 	import {
 		filterCustomerManager,
@@ -171,6 +201,9 @@
 				deptList: [],
 				dictCascadeData: [],
 				genderTypeCodeDict: [],
+				clueBizTypeDict: [],
+				clueObjTypeDict: [],
+				clueAdTypeDict: [],
 				originalDictCascadeData : [],
 				originaDeptList : [],
 	
@@ -234,6 +267,9 @@
 					clueOwnerName: undefined,
 					deptName: undefined,
 					deptId: undefined,
+					clueBizType: '回收',
+					clueObjType: '腕表',
+					clueAdType: '常规',
 				}
 			}
 		},
@@ -385,8 +421,20 @@
 				});
 	
 				this.$getDicts('sys_user_sex').then(res => {
-					this.genderTypeCodeDict = res;
-				});
+				this.genderTypeCodeDict = res;
+			});
+			
+			this.$getDicts('crm_clue_biz').then(res => {
+				this.clueBizTypeDict = res;
+			});
+			
+			this.$getDicts('crm_clue_obj').then(res => {
+				this.clueObjTypeDict = res;
+			});
+			
+			this.$getDicts('crm_clue_type').then(res => {
+				this.clueAdTypeDict = res;
+			});
 			},
 	
 		},

pages/clue/components/filterQuery.vue

@@ -59,7 +59,7 @@
 							</view>
 							<view class="dept_wrap form_input_pointer_events">
 								<ld-select :list="repetitionDict" label-key="dictLabel" value-key="dictValue"
-									placeholder="请选择" v-model="value.isVideoIdIsNull" :border="false"></ld-select>
+									placeholder="请选择" v-model="value.isVideoIdIsNull" :border="false" ></ld-select>
 								<u-icon slot="right" name="arrow-right"></u-icon>
 							</view>
 				
@@ -255,6 +255,33 @@
 									v-for="(item,index) in clueEntranceTypeDicts" :key="index"
 									@click="handleClickTag(item,'clueEntranceType')"></u-tag>
 							</view>
+							
+							<view class="title">
+								业务类别
+							</view>
+							<view class="dept_wrap form_input_pointer_events">
+								<ld-select :list="dicts.crmClueBiz" label-key="dictLabel" value-key="dictValue" placeholder="请选择业务类别"
+									v-model="value.clueBizType" :border="false" clearable></ld-select>
+								<u-icon slot="right" name="arrow-right"></u-icon>
+							</view>
+							
+							<view class="title">
+								物品类别
+							</view>
+							<view class="dept_wrap form_input_pointer_events">
+								<ld-select :list="dicts.crmClueObj" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品类别"
+									v-model="value.clueObjType" :border="false" clearable></ld-select>
+								<u-icon slot="right" name="arrow-right"></u-icon>
+							</view>
+							
+							<view class="title">
+								线索类别
+							</view>
+							<view class="dept_wrap form_input_pointer_events">
+								<ld-select :list="dicts.crmClueType" label-key="dictLabel" value-key="dictValue" placeholder="请选择线索类别"
+									v-model="value.clueAdType" :border="false" clearable></ld-select>
+								<u-icon slot="right" name="arrow-right"></u-icon>
+							</view>
 				
 						</view>
 						<u-tabbar :fixed="true" inactiveColor="#ffffff" class="case_tabbar" :placeholder="true"
@@ -614,6 +641,9 @@
 				this.value.followStatusList = [];
 				this.value.handleStateList = [];
 				this.value.clueEntranceType = [];
+				this.value.clueBizType = undefined;
+				this.value.clueObjType = undefined;
+				this.value.clueAdType = undefined;
 				this.value.manualProvince = undefined;
 				this.value.manualCity = undefined;
 				this.value.manualArea = undefined;

pages/clue/mixins/clue.js

@@ -25,11 +25,14 @@ export default {
 			clueTagGroupVoList: [],
 
 			dicts: {
-				caseStatusDicts: [],
-				crmFollowStatus: [],
-				crmCallStatus: [],
-				clueEntranceType: []
-			},
+					caseStatusDicts: [],
+					crmFollowStatus: [],
+					crmCallStatus: [],
+					clueEntranceType: [],
+					crmClueBiz: [],
+					crmClueObj: [],
+					crmClueType: []
+				},
 
 			options: [{
 					value: "3",
@@ -106,6 +109,9 @@ export default {
 				manualCity: undefined,
 				manualArea: undefined,
 				clueEntranceType: [],
+				clueBizType: undefined,
+				clueObjType: undefined,
+				clueAdType: undefined,
 				clueOperationId: undefined,
 				clueOwnerId: undefined,
 				sort: undefined,
@@ -172,18 +178,27 @@ export default {
 			this.resetData();
 		},
 		async getDicts() {
-			this.$getDicts('crm_clue_phase').then(res => {
-				this.dicts.caseStatusDicts = res;
-			});
-			this.$getDicts('crm_follow_status').then(res => {
-				this.dicts.crmFollowStatus = res;
-			})
-			this.$getDicts('crm_call_status').then(res => {
-				this.dicts.crmCallStatus = res;
-			})
-			this.$getDicts('clue_entrance_type').then(res => {
-				this.dicts.clueEntranceType = res;
-			});
+				this.$getDicts('crm_clue_phase').then(res => {
+					this.dicts.caseStatusDicts = res;
+				});
+				this.$getDicts('crm_follow_status').then(res => {
+					this.dicts.crmFollowStatus = res;
+				})
+				this.$getDicts('crm_call_status').then(res => {
+					this.dicts.crmCallStatus = res;
+				})
+				this.$getDicts('clue_entrance_type').then(res => {
+					this.dicts.clueEntranceType = res;
+				});
+				this.$getDicts('crm_clue_biz').then(res => {
+					this.dicts.crmClueBiz = res;
+				});
+				this.$getDicts('crm_clue_obj').then(res => {
+					this.dicts.crmClueObj = res;
+				});
+				this.$getDicts('crm_clue_type').then(res => {
+					this.dicts.crmClueType = res;
+				});
 			uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
 				data
 			}) => {

pages/orderDetail/index.vue

@@ -22,7 +22,7 @@
 			uni.stopPullDownRefresh();
 			// 刷新
 			uni.redirectTo({
-				url : `/pages/clueDetail/index?` + qs.stringify(this.params),
+				url : `/pages/orderDetail/index?` + qs.stringify(this.params),
 			})
 		},
 		onLoad(option) {

pages/orderDetail/page/detail.vue

@@ -218,6 +218,14 @@
           ref="commissionFormList"
         ></commission-form-list>
       </template>
+	  <template #sendInfo>
+	    <sendInfo
+	      :sendFormId="orderId"
+	      :clueId="clueId"
+		  :receiptDetail="receiptDetail"
+	      ref="sendInfo"
+	    ></sendInfo>
+	  </template>
     </yui-tabs>
 
     <u-tabbar
@@ -234,12 +242,12 @@
       ></u-tabbar-item>
       <u-tabbar-item
         text="添加收单"
-        icon="../../static/orderDetail/sd.png"
+        icon="../../static/orderDetail/tjsd.png"
         @click="handleAddReceiptForm"
       ></u-tabbar-item>
       <u-tabbar-item
         text="新增分成"
-        icon="../../static/orderDetail/add_commission.png"
+        icon="../../static/orderDetail/xzfc.png"
         @click="handleAddCommission"
       ></u-tabbar-item>
       <u-tabbar-item
@@ -274,12 +282,14 @@ import uploadFile from "../tabs/uploadFile/index.vue";
 import clueFollow from "../tabs/followRecord/index.vue";
 import receiptFormList from "../tabs/receiptFormList/receiptFormList.vue";
 import commissionFormList from "../tabs/commissionFormList/commissionFormList.vue";
+import sendInfo from "../tabs/sendInfo/index.vue";
 export default {
   components: {
     uploadFile,
     clueFollow,
     receiptFormList,
     commissionFormList,
+	sendInfo
   },
   props: {
     orderId: {
@@ -307,6 +317,10 @@ export default {
       crmFormStateDict: [],
       crmHandelStatusDict: [],
       tabs: [
+		{
+		  label: "发单信息",
+		  slot: "sendInfo",
+		},
         {
           label: "聊天附件",
           slot: "chatFile",

pages/orderDetail/tabs/sendInfo/index.vue

@@ -0,0 +1,176 @@
+<template>
+  <view class="caseInfo_wrap">
+    <view class="caseInfo_content_wrap">
+      <view class="caseInfo_title">
+        <view>
+          <image src="/static/clueDetail/icon-caseInfo.png" mode=""></image>
+          <text class="info_text">发单信息</text>
+        </view>
+        <u-icon name="edit-pen-fill" color="#2979ff" size="18" @click="handleEdit"></u-icon>
+      </view>
+      <view class="caseInfo_main_wrap">
+        <view class="Info_item" v-for="item in caseInfoColumn" :key="item.prop">
+          <text class="label">{{ item.label }}</text>
+          <text class="value">{{
+            item.dictType
+              ? $selectDictLabel(item.dictType, receiptDetail[item.prop])
+              : receiptDetail[item.prop]
+              ? receiptDetail[item.prop]
+              : "-"
+          }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+const caseInfoColumn = [
+  {
+    prop: "receiptDate",
+    label: "收单日期",
+  },
+  {
+    prop: "item",
+    label: "物品",
+  },
+  {
+    prop: "phone",
+    label: "电话",
+  },
+  {
+    prop: "authenticateNickName",
+    label: "鉴定",
+  },
+  {
+    prop: "category",
+    label: "类别",
+    dictType: "crm_form_category",
+  },
+  {
+    prop: "brand",
+    label: "品牌",
+    dictType: "crm_form_brand",
+  },
+  {
+    prop: "idCard",
+    label: "身份证号码",
+  },
+  {
+    prop: "customName",
+    label: "开户人姓名",
+  },
+  {
+    prop: "bankCardNumber",
+    label: "银行卡号",
+  },
+  {
+    prop: "bankName",
+    label: "银行名称",
+  },
+  {
+    prop: "paymentMethod",
+    label: "付款方式",
+  },
+  {
+    prop: "visitTime",
+    label: "计划上门时间",
+  },
+  {
+    prop: "remarks",
+    label: "补充说明",
+  },
+  {
+    prop: "priceRange",
+    label: "预估价格范围",
+  },
+  {
+    prop: "tactic",
+    label: "采用战术",
+    dictType: "crm_form_tactic",
+  },
+];
+export default {
+  props: {
+    receiptDetail: {
+      type: Object,
+      default: () => {},
+    },
+    sendFormId: {
+      type: [Number, String],
+      required: true,
+    },
+    clueId: {
+      type: [Number, String],
+      required: true,
+    },
+  },
+  data() {
+    return {
+      caseInfoColumn,
+    };
+  },
+  methods: {
+    handleEdit() {
+      uni.navigateTo({
+        url: `/pages/orderForm/index?clueId=${this.clueId}&sendFormId=${this.sendFormId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.caseInfo_wrap {
+  min-height: 400px;
+  .caseInfo_title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 80rpx;
+    background: #f4f4f6;
+    padding: 0 40rpx;
+
+    image {
+      width: 24rpx;
+      height: 24rpx;
+      margin-right: 10rpx;
+    }
+
+    .info_text {
+      font-size: 24rpx;
+      color: #202020;
+    }
+
+    .edit-btn {
+      font-size: 24rpx;
+      color: #3498db;
+      padding: 8rpx 16rpx;
+      border-radius: 8rpx;
+      background-color: #fff;
+      border: 1rpx solid #3498db;
+    }
+  }
+
+  .caseInfo_main_wrap {
+    .Info_item {
+      padding: 18rpx 40rpx;
+      display: flex;
+      justify-content: space-between;
+
+      .label {
+        color: #999999;
+        font-size: 26rpx;
+        width: 160rpx;
+      }
+
+      .value {
+        font-size: 26rpx;
+        color: #202020;
+        text-align: right;
+        width: 500rpx;
+      }
+    }
+  }
+}
+</style>

pages/orderForm/index.vue

@@ -40,16 +40,10 @@
 				</u-form-item>
 
 				<u-form-item label="物品品牌" prop="brand" borderBottom>
-				<ld-select
-					:list="brandDict"
-					label-key="dictLabel"
-					value-key="dictValue"
-					placeholder="请选择物品品牌"
-					v-model="form.brand"
-					:border="false"
-				></ld-select>
-				<u-icon slot="right" name="arrow-right"></u-icon>
-			</u-form-item>
+					<ld-select :list="brandDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品品牌"
+						v-model="form.brand" :border="false"></ld-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
 
 				<u-form-item label="价格范围" prop="priceRange" borderBottom>
 					<u--input v-model="form.priceRange" placeholder="请输入价格范围" border="none"></u--input>
@@ -69,26 +63,22 @@
 		</view>
 
 		<!-- 文件上传区域 -->
-		<view class="upload_area">
+		<view class="upload_area" v-if="!sendFormId">
 			<!-- 聊天记录附件 -->
 			<order-file-upload title="聊天记录附件" orderFileType="1" :file-list="form.chatAttachmentList"
-				@update:fileList="updateChatFiles" 
-				tip-text="上传聊天截图、录音等文件"></order-file-upload>
+				@update:fileList="updateChatFiles" tip-text="上传聊天截图、录音等文件"></order-file-upload>
 
 			<!-- 报价附件 -->
 			<order-file-upload title="报价附件" orderFileType="2" :file-list="form.quoteAttachmentList"
-				@update:fileList="updateQuoteFiles" 
-				tip-text="上传报价附件"></order-file-upload>
+				@update:fileList="updateQuoteFiles" tip-text="上传报价附件"></order-file-upload>
 
 			<!-- 高清图附件 -->
 			<order-file-upload title="高清图附件" orderFileType="3" :file-list="form.hdImageAttachmentList"
-				@update:fileList="updateHdImageFiles" 
-				tip-text="上传物品高清图片"></order-file-upload>
+				@update:fileList="updateHdImageFiles" tip-text="上传物品高清图片"></order-file-upload>
 
 			<!-- 其他附件 -->
 			<order-file-upload title="其他附件" orderFileType="4" :file-list="form.otherAttachmentList"
-				@update:fileList="updateOtherFiles" 
-				tip-text="上传其他相关文件"></order-file-upload>
+				@update:fileList="updateOtherFiles" tip-text="上传其他相关文件"></order-file-upload>
 		</view>
 
 	</view>
@@ -110,6 +100,8 @@
 				categoryDict: [],
 				tacticDict: [],
 				brandDict: [],
+				
+				sendFormId : undefined,
 
 				form: {
 					clueId: '',
@@ -194,6 +186,21 @@
 		},
 
 		methods: {
+			// 加载表单数据
+			async loadFormData(sendFormId) {
+				try {
+					const res = await uni.$u.api.getClueSendFormVoByOrderId({
+						id: sendFormId
+					});
+					if (res.code === 200) {
+						this.form = res.data;
+					}
+				} catch (error) {
+					console.error('加载表单数据失败:', error);
+					uni.$u.toast('加载表单数据失败');
+				}
+			},
+
 			// 获取地区选择
 			handleGetRegion(region) {
 				const [provinceData, cityData, areaData] = region;
@@ -228,21 +235,21 @@
 				console.log('文件上传变化:', data);
 			},
 			// 获取字典数据
-				async getDicts() {
-					try {
-						const [categoryRes, tacticRes, brandRes] = await Promise.all([
-							this.$getDicts('crm_form_category'),
-							this.$getDicts('crm_form_tactic'),
-							this.$getDicts('crm_form_brand')
-						]);
-
-						this.categoryDict = categoryRes;
-						this.tacticDict = tacticRes;
-						this.brandDict = brandRes;
-					} catch (error) {
-						console.error('获取字典数据失败:', error);
-					}
-				},
+			async getDicts() {
+				try {
+					const [categoryRes, tacticRes, brandRes] = await Promise.all([
+						this.$getDicts('crm_form_category'),
+						this.$getDicts('crm_form_tactic'),
+						this.$getDicts('crm_form_brand')
+					]);
+
+					this.categoryDict = categoryRes;
+					this.tacticDict = tacticRes;
+					this.brandDict = brandRes;
+				} catch (error) {
+					console.error('获取字典数据失败:', error);
+				}
+			},
 
 			// 处理保存
 			async handleNavSaveClick() {
@@ -250,24 +257,43 @@
 					// 表单验证
 					await this.$refs.form.validate();
 
-					// 合并所有附件
-					const allAttachments = [
-						...this.form.chatAttachmentList,
-						...this.form.quoteAttachmentList,
-						...this.form.hdImageAttachmentList,
-						...this.form.otherAttachmentList
-					];
-
-					// 准备提交数据
-					const submitData = {
-						...this.form,
-						uploadList: allAttachments
-					};
-
-					// 调用保存接口
-					await uni.$u.api.saveClueOrderForm(submitData);
-
-					uni.$u.toast('发单记录添加成功');
+					if (this.form.id) {
+						const updatedForm = {
+							id: this.form.id,
+							item: this.form.item,
+							phone: this.form.phone,
+							authenticateUserId: this.form.authenticateUserId,
+							category: this.form.category,
+							brand: this.form.brand,
+							idCard: this.form.idCard,
+							customName: this.form.customName,
+							bankCardNumber: this.form.bankCardNumber,
+							bankName: this.form.bankName,
+							paymentMethod: this.form.paymentMethod,
+							visitTime: this.form.visitTime,
+							remarks: this.form.remarks,
+							priceRange: this.form.priceRange,
+							tactic: this.form.tactic
+						}
+						await uni.$u.api.updateClueOrderForm(updatedForm);
+						uni.$u.toast('发单记录更新成功');
+					} else {
+						// 合并所有附件
+						const allAttachments = [
+							...this.form.chatAttachmentList,
+							...this.form.quoteAttachmentList,
+							...this.form.hdImageAttachmentList,
+							...this.form.otherAttachmentList
+						];
+						
+						// 准备提交数据
+						const submitData = {
+							...this.form,
+							uploadList: allAttachments
+						};
+						await uni.$u.api.saveClueOrderForm(submitData);
+						uni.$u.toast('发单记录添加成功');
+					}
 
 					// 延迟返回
 					setTimeout(() => {
@@ -285,8 +311,12 @@
 
 		onLoad(option) {
 			const clueId = option.clueId;
+			this.sendFormId = option.sendFormId;
 			this.form.clueId = clueId;
 			this.getDicts();
+			if (option.sendFormId) {
+				this.loadFormData(option.sendFormId);
+			}
 		}
 	}
 </script>

pages/receiptForm/index.vue

@@ -635,7 +635,7 @@ export default {
       try {
         const params = {
           clueId: this.receiptDetail.clueId,
-          sourceId: this.receiptDetail.sendFormId,
+          sourceId: this.receiptDetail.id,
           notBound: "1",
           orderFileType: "3",
           type: "2",
@@ -694,7 +694,6 @@ export default {
     // 提交表单
     submitForm() {
       this.$refs.receiptFormRef.validate().then(async (valid) => {
-        console.log(valid);
         if (valid) {
           await this.handleUpdate();
         } else {

utils/api.js

@@ -26,7 +26,7 @@ const install = (Vue, vm) => {
 		addCaseOutEquipment : (data = {})=>http.post("system/caseOutEquipment",data), // 申请mac地址授权
 		checkOutEquipment : (params = {},config)=>http.get("/system/caseOutEquipment/checkOutEquipment",{params,...config}), // 检测外访设备是否有申请通过记录
 		concatRecord : (files,params = {})=>http.upload('/fileVisit/concatRecord',{files, params , name: 'files', timeout: 1000 * 60 * 10, custom : { loadingText : "上传中" }}), // 合并录音并上传
-		uploadFile : (url,params = {})=> http.upload('/file/upload',{filePath: url,params ,name : "file",timeout: 1000 * 60 * 10,custom : { loadingText : "上传中" }}), // 上传文件
+		uploadFile : (url,params = {})=> http.upload('/file/aliossUpload',{filePath: url,params ,name : "file",timeout: 1000 * 60 * 10,custom : { loadingText : "上传中" }}), // 上传文件
 		watermarkUpload : (url,params = {})=> http.upload('/fileVisit/watermarkUpload',{filePath: url, params, name : "file",timeout: 1000 * 60 * 10,custom : { loadingText : "上传中" }}), // 上传文件
 		getOutPolyline : (params = {})=>http.get("/system/caseOutPolyline/getOutPolyline",{ params , custom : { loading: false } }), // 请求外访轨迹列表
 		addOutPolyline : (data = {})=>http.post("/system/caseOutPolyline/addOutPolyline",data,{ custom : { loading: false } }), // 添加外访轨迹
@@ -108,7 +108,8 @@ const install = (Vue, vm) => {
 		clueCommissionUpdate: (data={})=>http.put(store.state.user.path + '/clueCommissionForm',data),
 		clueCommissionById: (id,config={})=>http.get(store.state.user.path + '/clueCommissionForm/' + id),
 		clueCommissionRemove: (ids,config={})=>http.post(store.state.user.path + '/clueCommissionForm/remove',ids),
-		getCustomerManagerAllList: ()=>http.post('/system/user/getCustomerManagerAllList')
+		getCustomerManagerAllList: ()=>http.post('/system/user/getCustomerManagerAllList'),
+		getClueSendFormVoByOrderId: (params)=>http.get(store.state.user.path + '/clueSendForm/getClueSendFormVoByOrderId?' + qs.stringify(params)),
 	}
 }