补充品牌素筛选

pages/clueDetail/page/clueDetail.vue

@@ -93,23 +93,26 @@
 		</view>
 
 
-		<yui-tabs :tabs="tabs" v-model="activeIndex" :lineWidth="'120rpx'" :isLazyRender="false"
-			color="#108cff" titleActiveColor="#108cff" :swipeable="true" :swiper="false" :ellipsis="false" :scroll-threshold="3">
+		<yui-tabs :tabs="tabs" v-model="activeIndex" :lineWidth="'120rpx'" :isLazyRender="false" color="#108cff"
+			titleActiveColor="#108cff" :swipeable="true" :swiper="false" :ellipsis="false" :scroll-threshold="3">
 			<template #clueInfo>
-				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :params="params" ref="clueInfoRef" type="1"></clueInfo>
+				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :params="params" ref="clueInfoRef" type="1">
+				</clueInfo>
 			</template>
 			<template #advertising>
 				<advertising :clueId="clueDetail.id" v-if="clueDetail.id" ref="advertisingRef"></advertising>
 			</template>
 			<template #followRecord>
-				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="1"></followRecord>
+				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="1">
+				</followRecord>
 			</template>
 			<template #callRecord>
 				<callRecord :clueId="clueDetail.id" :clueDetail="clueDetail" v-if="clueDetail.id" ref="callRecordRef">
 				</callRecord>
 			</template>
 			<template #orderFollow>
-				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="3"></followRecord>
+				<followRecord :clueId="clueDetail.id" v-if="clueDetail.id" ref="followRecordRef" type="3">
+				</followRecord>
 			</template>
 		</yui-tabs>
 		<u-tabbar class="clueDetail_tabber" :fixed="true" inactiveColor="#ffffff" :placeholder="true"
@@ -318,18 +321,46 @@
 				if (count > 0) {
 					uni.showModal({
 						title: '该线索已发单是否再次发单？',
-						success: function (res) {
+						success: (res)=> {
 							if (res.confirm) {
-								uni.navigateTo({
-									url: `/pages/orderForm/index?clueId=${this.clueId}`
-								})
+								this.toOrderForm()
 							}
 						}
 					});
-				}else{
+				} else {
+					this.toOrderForm()
+				}
+			},
+			toOrderForm() {
+				const {
+					id,
+					ownLatestDynamicTime,
+					createTime,
+					clueOwnerId
+				} = this.clueDetail;
+				if (this.$store.state.user.userInfo.userId === clueOwnerId) {
 					uni.navigateTo({
 						url: `/pages/orderForm/index?clueId=${this.clueId}`
 					})
+				} else {
+					// 确定用于判断的目标时间（ownLatestDynamicTime，为null则用createTime）
+					const date = ownLatestDynamicTime || createTime
+
+					const twoDaysLater = new Date(date)
+					twoDaysLater.setDate(twoDaysLater.getDate() + 2) // 日期加2天
+
+					// 是否大于当前时间 小于可以发单
+					let isOrderForm = false
+					if (twoDaysLater) {
+						isOrderForm = twoDaysLater.getTime() <= new Date().getTime()
+					}
+					if (isOrderForm) {
+						uni.navigateTo({
+							url: `/pages/orderForm/index?clueId=${this.clueId}`
+						})
+					} else {
+						uni.$u.toast('非所属人需两天内无跟进记录才可发单')
+					}
 				}
 			},
 			// 添加跟进记录

pages/receiptForm/index.vue

@@ -28,13 +28,16 @@
           ></u--input>
         </u-form-item>
 
-        <u-form-item label="客服" prop="customerServiceName" borderBottom>
-          <u--input
+        <u-form-item label="订单类型" prop="customerServiceName" borderBottom>
+          <ld-select
+            :list="sendOrderTypeDict"
+            label-key="dictLabel"
+            value-key="dictValue"
+            placeholder="请选择类别"
             v-model="form.customerServiceName"
-            placeholder="请输入客服姓名"
-            border="none"
-            :disabled="!isEdit"
-          ></u--input>
+            :border="false"
+          ></ld-select>
+          <u-icon slot="right" name="arrow-right"></u-icon>
         </u-form-item>
 
         <u-form-item
@@ -360,6 +363,7 @@ export default {
         { label: "否", value: 2 },
       ],
       categoryDict: [],
+      sendOrderTypeDict: [],
       brandDict: [],
       labelStyle: {
         fontSize: "28rpx",
@@ -523,12 +527,14 @@ export default {
     // 获取字典数据
     async getDicts() {
       try {
-        const [categoryRes, brandRes] = await Promise.all([
+        const [categoryRes, brandRes,sendOrderTypeRes] = await Promise.all([
           this.$getDicts("crm_form_category"),
-          this.$getDicts("crm_form_brand")
+          this.$getDicts("crm_form_brand"),
+		  this.$getDicts("crm_sendOrder_type")
         ]);
         this.categoryDict = categoryRes;
         this.brandDict = brandRes;
+		this.sendOrderTypeDict = sendOrderTypeRes;
       } catch (error) {
         console.error("获取字典数据失败:", error);
       }

utils/api.js

@@ -102,6 +102,7 @@ const install = (Vue, vm) => {
 		listReceiptFormByOrderId:(orderFormId,config={})=>http.get(store.state.user.path + '/clueReceiptForm/listByOrderId/' + orderFormId),
 		getReceiptForm:(id,config={})=>http.get(store.state.user.path + '/clueReceiptForm/' + id),
 		delReceiptForm:(id,config={})=>http.delete(store.state.user.path + '/clueReceiptForm/' + id),
+		saveClueOrderForm:(data={})=>http.post(store.state.user.path + '/clueSendForm/saveClueOrderForm',data),
 	}
 }