From 93d0597d0836ee859bc907c4371eb7c23f692f6a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 1 Jul 2024 17:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/host.js                                |  4 +--
 .../afterSalesDetails/afterSalesDetails.vue   | 29 ++++++++++++++++---
 pagesHome/pages/taskDetails/clientInfo.vue    | 11 +++++--
 .../pages/InstallTaskList/InstallTaskList.vue |  4 +--
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/config/host.js b/config/host.js
index 8085b22..f4b6276 100644
--- a/config/host.js
+++ b/config/host.js
@@ -23,8 +23,8 @@
 // cg
 // const devhost = 'http://192.168.10.200:13000/'
 // lg
-// const devhost = 'http://192.168.3.16:9922/'
-const devhost = 'http://192.168.5.34:9922/'
+const devhost = 'http://192.168.3.16:9922/'
+// const devhost = 'http://192.168.5.34:9922/'
 /**
  * 正式域名
  * */
diff --git a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
index fc522f8..313f415 100644
--- a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
+++ b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
@@ -12,7 +12,7 @@
 				</view>
 
 				<view class="mt20">
-					关联任务编号：
+					关联任务编号：{{details.info.install && details.info.install.no}}
 				</view>
 			</view>
 
@@ -87,7 +87,8 @@
 						确认完工
 					</view>
 
-					<view class="button primaryColor" @click="handleConfirmCompletion">
+					<view class="button primaryColor" @click="handleConfirmCompletion"
+						v-if="details.buttonPermissionObj.confirmAOG">
 						确认到货
 					</view>
 
@@ -347,6 +348,28 @@
 
 				return false
 			}),
+			/** 确认到货 */
+			confirmAOG: computed(() => {
+				const { id } = details.userInfo
+
+				console.log('id :>> ', id);
+
+				const { installSales, installWork } = details.info as any
+
+				if (utils.getObjType(installSales) !== 'object' || utils.getObjType(installWork) !== 'object') return false
+
+				if (!installWork.work_user_ids || !installWork.work_user_ids.includes(id)) return false
+
+				if (installSales.type === 5 || installSales.type === 6) return true
+
+				const _status = Number(installSales.status)
+
+				const whiteArr = [4]
+
+				if (whiteArr.includes(_status)) return true
+
+				return false
+			}),
 			/** 确认指派 */
 			confirmAssign: computed(() => {
 				console.log('Number(details.userInfo.role_code) :>> ', Number(details.userInfo.role_code));
@@ -373,8 +396,6 @@
 	onLoad(async (e) => {
 		console.log('e :>> ', e);
 		details.pageInfo = JSON.parse(e.pageInfo)
-
-
 	})
 
 	onShow(async () => {
diff --git a/pagesHome/pages/taskDetails/clientInfo.vue b/pagesHome/pages/taskDetails/clientInfo.vue
index 39d33a6..c6466ca 100644
--- a/pagesHome/pages/taskDetails/clientInfo.vue
+++ b/pagesHome/pages/taskDetails/clientInfo.vue
@@ -73,8 +73,8 @@
 		</view> -->
 
 		<view class="row flex-c-sb">
-			<text class="title">预约完成时间</text>
-			<text class="info">{{info.install_time}}</text>
+			<text class="title">预计完成时间</text>
+			<text class="info">{{installWork.estimated_finish_time}}</text>
 		</view>
 
 		<view class="row flex-c-sb">
@@ -141,6 +141,13 @@
 		else return {}
 	})
 
+	const installWork = computed(() => {
+		console.log('props.info :>> ', props.info);
+
+		if (props.info && props.info.installWork) return props.info.installWork
+		else return {}
+	})
+
 	/** 打电话 */
 	const handleCallPhone = () => {
 		uni.makePhoneCall({
diff --git a/pagesUser/pages/InstallTaskList/InstallTaskList.vue b/pagesUser/pages/InstallTaskList/InstallTaskList.vue
index c9392bd..d8c6d6a 100644
--- a/pagesUser/pages/InstallTaskList/InstallTaskList.vue
+++ b/pagesUser/pages/InstallTaskList/InstallTaskList.vue
@@ -114,7 +114,7 @@
 										</view>
 
 										<view class="mt20 flex-c-sb">
-											<text>预计完成时间：{{ item.expect_install_time }}</text>
+											<text>预计安装时间：{{ item.expect_install_time }}</text>
 										</view>
 									</view>
 								</view>
@@ -150,7 +150,7 @@
 											<view>安装人员：{{ item.work_users }}</view>
 										</view>
 
-										<view class="mt10">预计完成时间：{{ item.expect_install_time }}</view>
+										<view class="mt10">预计安装时间：{{ item.expect_install_time }}</view>
 									</view>
 								</view>
 							</template>