From 062daab8405b02ed4914fff1c7e09d80df798698 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 23 May 2025 10:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=AA=E5=90=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/visit/addrecord.vue | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 966dff9..2784da5 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -181,16 +181,17 @@
 				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName"
 					@tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
 			</uni-forms-item>
-			<view class="formtext" v-if="visitAreaText=='生产区'">陪同人信息</view>
-			<uni-forms-item label="陪同人" required name="accompanyName" v-if="visitAreaText=='生产区'">
-				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
-					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
-			</uni-forms-item>
+			
 			<view class="formtext" v-if="form.type==3">收货人信息</view>
-
 			<uni-forms-item label="收货人" v-if="form.type==3" required name="goodsName">
 				<uni-easyinput @clear="clearAccept('goods')" disabled v-model="form.goodsName"
 					@tap="adminListShowOpen('goods')" placeholder="请选择联系人员" />
+			</uni-forms-item>
+			
+			<view class="formtext" v-if="visitAreaText=='生产区'">陪同人信息</view>
+			<uni-forms-item label="陪同人" required name="accompanyName" v-if="visitAreaText=='生产区'">
+				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
+					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
 			</uni-forms-item>
 			<qianziyu-select :show="adminListShow" type="radio" :popupTitle="'联系人员'" name="cworkStationName"
 				:dataLists="adminList" placeholder="输入陪同人具体姓名或手机号搜索" @search="selectSearch" @submit="submitAccept"
@@ -526,24 +527,26 @@
 				}
 			},
 			submitAccept(e) {
-				console.log(e)
+				console.log(e)
+				this.form.accompany_id = e.id
+				this.form.accompanyName = e.name
 				if (this.acceptType == 'accept') {
 					this.form.accept_admin_id = e.id
 					this.form.accpet_department_id = e.department_id
 					this.form.acceptName = e.name
-					if (this.visitAreaText == '非生产区'||this.visitAreaText == '研发R&D') {
-						this.form.accompany_id = e.id
-						this.form.accompanyName = e.name
-					}
+					// if (this.visitAreaText == '非生产区'||this.visitAreaText == '研发R&D') {
+					// 	this.form.accompany_id = e.id
+					// 	this.form.accompanyName = e.name
+					// }
 				} else if (this.acceptType == 'goods') {
 					this.form.accept_goods_admin_id = e.id
 					this.form.accept_admin_id = e.id
 					this.form.accpet_department_id = e.department_id
 					this.form.goodsName = e.name
-					if (this.visitAreaText == '非生产区'||this.visitAreaText == '研发R&D') {
-						this.form.accompany_id = e.id
-						this.form.accompanyName = e.name
-					}
+					// if (this.visitAreaText == '非生产区'||this.visitAreaText == '研发R&D') {
+					// 	this.form.accompany_id = e.id
+					// 	this.form.accompanyName = e.name
+					// }
 				} else {
 					this.form.accompany_id = e.id
 					this.form.accompanyName = e.name
@@ -844,7 +847,9 @@
 				})
 			},
 			submitForm() {
-				let that = this
+				let that = this
+				console.log("form",this.form)
+				// return
 				this.util.request({
 					api: '/api/admin/visit/save',
 					method: "POST",