From 5848261585664553278a0231493119845405444a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sun, 30 Jun 2024 22:43:47 +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

---
 compoment/BasicContainer/BasicContainer.vue   |    6 +-
 compoment/MyDrawer/MyDrawer.vue               |    4 +-
 compoment/PopUp/PopUp.vue                     |    7 +-
 compoment/ShowImgBox/ShowImgBox.vue           |   52 +
 config/host.js                                |    4 +-
 main.js                                       |    4 +-
 pages.json                                    |   19 +
 .../ArrivalConfirmation.vue                   |  488 ++++++
 .../InitiateAfterSalesService.vue             |   10 +-
 .../ParticularsOfCompletion.vue               |   16 +-
 pagesHome/pages/addInfo/addInfo.vue           |   15 +-
 .../afterSalesDetails/afterSalesDetails.vue   |    6 +-
 .../pages/checkAndAccept/checkAndAccept.vue   |  167 +-
 pagesHome/pages/taskDetails/clientInfo.vue    |    2 +-
 pagesHome/pages/taskDetails/nodeInfo.vue      |   14 +
 .../pages/taskDetails/serviceContent.vue      |   14 +-
 .../InstallAfterSalesTaskList.vue             | 1526 +++++++++--------
 .../pages/InstallTaskList/InstallTaskList.vue | 1503 ++++++++--------
 18 files changed, 2240 insertions(+), 1617 deletions(-)
 create mode 100644 compoment/ShowImgBox/ShowImgBox.vue
 create mode 100644 pagesHome/pages/ArrivalConfirmation/ArrivalConfirmation.vue

diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue
index 647a840..8d5d3f2 100644
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@@ -44,7 +44,9 @@
 		option: {
 			type: Object,
 			default: {
-				pageLoading: false
+				pageLoading: false,
+				/** 是否执行触底函数 */
+				haveReachBottom: true
 			}
 		},
 		title: {
@@ -81,6 +83,8 @@
 	let antiShake : any = null
 	// 触底加载
 	onReachBottom(() => {
+		if (props.option.haveReachBottom === false) return
+
 		// 数据请求完毕, 不再请求
 		if (props.option.isEnd) {
 			return uni.showToast({
diff --git a/compoment/MyDrawer/MyDrawer.vue b/compoment/MyDrawer/MyDrawer.vue
index 5bd4e82..5d77118 100644
--- a/compoment/MyDrawer/MyDrawer.vue
+++ b/compoment/MyDrawer/MyDrawer.vue
@@ -220,7 +220,7 @@
 
 		.buttonContainer {
 			width: 100%;
-			padding: 20upx 0;
+			padding: 20upx 0 60upx;
 			flex: 1;
 			display: flex;
 			justify-content: space-around;
@@ -228,7 +228,7 @@
 			zoom: 0.9;
 
 			>view {
-				padding: 20upx 80upx;
+				padding: 25upx 100upx;
 				border-radius: 10upx;
 				background: var(--subjectColor);
 				color: #fff;
diff --git a/compoment/PopUp/PopUp.vue b/compoment/PopUp/PopUp.vue
index 5c335c2..1295ea6 100644
--- a/compoment/PopUp/PopUp.vue
+++ b/compoment/PopUp/PopUp.vue
@@ -116,17 +116,15 @@
 
 		.buttonContainer {
 			width: 100%;
-			// height: 12vh;
-			padding: 20upx 0;
+			padding: 20upx 0 60upx;
 			flex: 1;
 			display: flex;
 			justify-content: space-around;
 			align-items: center;
 			zoom: 0.9;
-			// padding: 20upx;
 
 			>view {
-				padding: 20upx 80upx;
+				padding: 25upx 100upx;
 				border-radius: 10upx;
 				background: var(--subjectColor);
 				color: #fff;
@@ -135,7 +133,6 @@
 			.closeButton {
 				color: #000;
 				background: #F5F5F6;
-				// border: 2upx solid var(--subjectColor);
 			}
 		}
 
diff --git a/compoment/ShowImgBox/ShowImgBox.vue b/compoment/ShowImgBox/ShowImgBox.vue
new file mode 100644
index 0000000..d48caf9
--- /dev/null
+++ b/compoment/ShowImgBox/ShowImgBox.vue
@@ -0,0 +1,52 @@
+<template>
+	<!-- 蒙层 -->
+	<view v-if="modelValue" @click="modelValue = false" class="mask flex-c-c" @touchmove.stop>
+		<image :src="props.imgUrl" mode="widthFix"></image>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { defineProps, defineEmits, computed } from 'vue';
+
+	const props = defineProps({
+		// 是否显示
+		modelValue: {
+			type: Boolean,
+			requird: true
+		},
+		// 图片地址
+		imgUrl: {
+			type: String,
+			requird: true
+		}
+	})
+
+	const $emit = defineEmits(['update:modelValue'])
+
+	const modelValue = computed({
+		get() {
+			return props.modelValue
+		},
+		set(value) {
+			$emit('update:modelValue', value)
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import url(@/utils/style/common.scss);
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99999;
+		background-color: rgba(0, 0, 0, 0.6);
+		width: 100vw;
+		height: 100vh;
+
+		image {
+			width: 100%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/config/host.js b/config/host.js
index f4b6276..8085b22 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/main.js b/main.js
index 30751ab..988df17 100644
--- a/main.js
+++ b/main.js
@@ -34,8 +34,9 @@ import saomiao2 from '@/compoment/saomiao2.vue'
 /** 输入框组件 */
 import MyInput from '@/compoment/MyInput/MyInput.vue';
 /** 抽屉组件 */
-/** 输入框组件 */
 import MyDrawer from '@/compoment/MyDrawer/MyDrawer';
+/** 图片显示组件 */
+import ShowImgBox from '@/compoment/ShowImgBox/ShowImgBox';
 
 import utils from '@/utils/utils.js'
 import Store from '@/store/index.js'
@@ -62,6 +63,7 @@ export function createApp() {
 		.component('CheckBox', CheckBox)
 		.component('MyInput', MyInput)
 		.component('MyDrawer', MyDrawer)
+		.component('ShowImgBox', ShowImgBox)
 
 	uni.$u.config.unit = 'rpx'
 	return {
diff --git a/pages.json b/pages.json
index d71d37c..b14eaab 100644
--- a/pages.json
+++ b/pages.json
@@ -343,6 +343,25 @@
 						}
 					}
 
+				},
+				{
+					"path": "pages/ArrivalConfirmation/ArrivalConfirmation",
+					"style": {
+						"navigationBarTitleText": "指派",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 1,
+						"navigationStyle": "custom",
+						"app-plus": {
+							"animationDuration": 300,
+							"animationType": "zoom-fade-out",
+							"pullToRefresh": {
+								"support": true,
+								"color": "#d3832a", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
+
 				}
 			]
 		},
diff --git a/pagesHome/pages/ArrivalConfirmation/ArrivalConfirmation.vue b/pagesHome/pages/ArrivalConfirmation/ArrivalConfirmation.vue
new file mode 100644
index 0000000..b3572f1
--- /dev/null
+++ b/pagesHome/pages/ArrivalConfirmation/ArrivalConfirmation.vue
@@ -0,0 +1,488 @@
+<template>
+	<BasicContainer ref="basicContainer" :option="option">
+		<!-- 头部 -->
+		<template #head></template>
+
+		<!-- 主体 -->
+		<template #body></template>
+	</BasicContainer>
+
+	<view class="">
+		<view class="main_container">
+			<!-- 到货信息 -->
+			<view class="info_item border_bottom">
+				<view class="info_item_title flex-c-sb" @click="details.popUpObj.afterSalesType = true">
+					<view class="">
+						到 货 信 息
+					</view>
+				</view>
+			</view>
+
+			<!-- 行 -- 售后类型 -->
+			<view class="info_item border_bottom">
+				<view class="info_item_title flex-c-sb" @click="details.popUpObj.afterSalesType = true">
+					<view class="">
+						到 货 状 态
+					</view>
+
+					<view>
+						<text class="mr10 fwn info">
+							{{ installSales.status >= 3? '已到货':'未到货' }}
+						</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 行 -- 售后类型 -->
+			<view class="info_item border_bottom">
+				<view class="info_item_title flex-c-sb">
+					<view class="">
+						到 货 包 件
+					</view>
+
+					<!-- 新增售后包件 -->
+					<view class="flex addBtn" @click="handleAddPackage">
+						<view class="addButton">
+							<u-icon name="close-circle" color="#2F8DFF" size="36"></u-icon>
+						</view>
+
+						<text class="ml10 fwn">
+							添加
+						</text>
+					</view>
+				</view>
+			</view>
+
+			<scroll-view class="scvmabx" :style="{height: details.scrollheight}" @scrolltolower="()=>{}" scroll-y="true"
+				@touchmove.stop>
+				<!-- 售后包件列表 -->
+				<view :class="{packageList: true, pd20: details.packageList.length > 0}"
+					:style="{height: (details.packageList.length > 0 ?(40 * details.packageList.length) + ((details.packageList.length - 1) * 10): 0)  + 'px'}">
+					<block v-for="(item, index) in details.packageList">
+						<view :class="{'packageItem': true, 'flex-c-sb': true, 'mt20': index !== 0}">
+							<view class="inputBox flex1 flex">
+								<input class="packageInput flex1" v-model="details.packageList[index]" placeholder="请输入包条码" />
+
+								<view class="scanIcon flex-c-c" @click.stop="()=> handleScan(item)">
+									<u-icon name="scan" color="#2F8DFF" size="60"></u-icon>
+								</view>
+							</view>
+
+							<view class="ml20 flex-c-c" @click="()=> handleRemovePackage(index)">
+								<u-icon name="trash" color="#8792AA" size="36"></u-icon>
+
+								<text class="ml10 info">
+									删除
+								</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+
+
+
+			<view class="felx-c-c mb20">
+				<view class="button subColor" @click="handleArrivalNotice">
+					到货确认
+				</view>
+			</view>
+		</view>
+
+		<MyDrawer ref="myDrawer">
+			<template #content>
+				<picker-view v-if="details.visible" :indicator-style="details.indicatorStyle" :immediate-change="true"
+					:value="details.value" @change="bindChange" class="picker-view">
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in details.pickerArr" :key="index">
+							{{ item.label }}
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</template>
+		</MyDrawer>
+	</view>
+	<tips ref="tip" />
+</template>
+
+<script lang="ts" setup>
+	import {
+		postInstallAfterUpdate,
+		postCenterInstallSalesTheArrival
+	} from '@/api/user.js'
+	import {
+		onLoad,
+		onShow,
+		onHide,
+	} from '@dcloudio/uni-app'
+	import { nextTick, reactive, ref, toRefs, computed, defineExpose } from "vue";
+	import utils from '@/utils/utils.js'
+	import type { PropType } from 'vue';
+
+
+	// 组件配置
+	const option = reactive({
+		// 标题
+		title: '确认到货',
+		// 下拉刷新回调函数
+		async pullDownRefreshInitPage() {
+			return null
+		},
+		// 触底加载回到函数
+		reachBottomInitPage: async () => {
+			return null
+		},
+		haveData: true,
+		isEnd: false,
+		pageLoading: false,
+		haveReachBottom: false
+	})
+
+
+	const props = defineProps({
+		/** 页面路由数据 */
+		pageInfo: {
+			type: Object as PropType<Object>,
+			required: true,
+		},
+		/** 页面数据 */
+		info: {
+			type: Object as PropType<Object>,
+			required: true,
+		},
+		/** 开启loading */
+		handleSetLoading: {
+			type: Function as PropType<Function>,
+			required: true
+		},
+		/** 刷新数据 */
+		handleRefresh: {
+			type: Function as PropType<Function>,
+			required: true
+		},
+		/** */
+	})
+
+	const pageInfo = computed(() => {
+		console.log('props.pageInfo :>> ', props.pageInfo);
+
+		if (props.pageInfo) return props.pageInfo
+		else return {}
+	})
+
+	const installSales = computed(() => {
+		console.log('props.info :>> ', props.info);
+
+		if (props.info && props.info.installSales) return props.info.installSales
+		else return {}
+	})
+
+
+
+	const myDrawer = ref()
+	const tip = ref()
+
+
+	let details = reactive({
+		/** 主页面高度 */
+		scrollheight: '80vh',
+		/** 表单数据 */
+		form: {
+			type: '',
+			typeName: '',
+			/** 备注 */
+			remark: ''
+		},
+		/** 售后包件列表 */
+		packageList: [],
+		/** 售后图片列表 */
+		imgList: [],
+		/** 扫描码值 */
+		scancode: '',
+		/** 是否显示弹窗 */
+		popUpObj: {
+			/** 异常类型 */
+			afterSalesType: false
+		},
+		/** picker行高度 */
+		indicatorStyle: `height: 40px;`,
+		visible: false,
+		value: [0],
+		pickerArr: [
+			{
+				label: '调试',
+				value: '1'
+			},
+			{
+				label: '维修',
+				value: '2'
+			},
+			{
+				label: '理赔',
+				value: '3'
+			},
+			{
+				label: '待确认',
+				value: '4'
+			}, {
+				label: '换货',
+				value: '5'
+			},
+			{
+				label: '工厂补单',
+				value: '6'
+			},
+
+		],
+		/** 页面信息 */
+		pageInfo: {
+			id: ''
+		}
+	})
+
+	onLoad((e) => {
+		details.pageInfo.id = e.id
+	})
+
+	onShow(async () => {
+		// #ifdef APP
+		// 初始化关闭监听
+		uni.$off('scancodedate')
+		// init()
+		uni.$on('scancodedate', function (code) {
+			console.log('code :>> ', code);
+			if (code) {
+				console.log(code);
+				details.scancode = code
+				scandata()
+			}
+		})
+		// #endif
+
+		await nextTick()
+		// basicContainer.value.startPullDownRefresh()
+		const _height = await utils.getViewDistanceFormTop('.scvmabx')
+
+		details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px'
+	})
+
+	const scandata = () => { }
+
+	const initpage = () => { }
+
+	/** 显示扫描 */
+	const handleScan = (value) => {
+		console.log('value :>> ', value);
+		// #ifdef MP-WEIXIN
+		// 微信小程序适配
+		uni.scanCode({
+			success(res) {
+				console.log('res :>> ', res);
+				console.log('res.result :>> ', res.result);
+				for (let i = 0; i < details.packageList.length; i++) {
+					const value = details.packageList[i]
+
+					if (value === res.result) return utils.handleToast('码值已存在')
+				}
+
+				value = res.result
+				// scandata()
+			}
+		})
+		return
+		// #endif
+	}
+
+	/** 新增售后包件 */
+	const handleAddPackage = () => {
+		details.packageList.push('')
+	}
+
+	/** 删除售后包件 */
+	const handleRemovePackage = (index : number) => {
+		details.packageList.splice(index, 1)
+	}
+
+	/** picker切换时执行 */
+	const bindChange = function (e, type) {
+		console.log('type :>> ', type);
+		console.log('e :>> ', e);
+
+		details.value = e.detail.value
+
+	}
+
+	/** 到货 */
+	const handleArrivalNotice = () => {
+		// postCenterInstallSalesTheArrival
+		console.log('details.packageList :>> ', details.packageList);
+
+		tip.value.setdetails({
+			isshow: true,
+			content: '确认到货',
+			cancelTxt: '部分到货',
+			confirmTxt: '确认到货',
+			async success() {
+				try {
+					props.handleSetLoading(true)
+
+					const submitData = {
+						install_sales_id: pageInfo.value.id,
+						status: 0,
+						packages: details.packageList.filter(val => val)
+					}
+
+					const res = await postCenterInstallSalesTheArrival(submitData)
+
+					const { code, data } = res
+
+					if (code !== 200) return
+					props.handleRefresh()
+
+				} catch (err) {
+					console.log('err :>> ', err);
+					//TODO handle the exception
+				} finally {
+					props.handleSetLoading(false)
+					// 关闭弹窗
+					tip.value.setdetails({ isshow: false })
+
+				}
+			},
+			cancel() {
+				// 关闭弹窗
+				tip.value.setdetails({ isshow: false })
+			}
+		})
+	}
+
+	defineExpose({ details })
+</script>
+
+<style lang="scss" scoped>
+	@import url("@/utils/style/common.scss");
+
+	.info {
+		color: #AFB4BA;
+	}
+
+	.main_container {
+		// padding: 0 20upx;
+		background-color: #fff;
+	}
+
+	// 行
+	.info_item {
+		margin: 0 20upx;
+		padding: 20upx;
+
+		.info_item_title {
+			// padding: 0 0 20upx;
+			font-weight: bold;
+			height: 40upx;
+			line-height: 40upx;
+		}
+
+
+		&.border_bottom {
+			border-bottom: 2upx solid #eee;
+		}
+
+		:deep(.u-textarea) {
+			background-color: #f5f5f6;
+			border: none;
+			height: 200upx;
+		}
+
+		// 添加
+		.addBtn {
+			color: #2F8DFF;
+
+			.addButton {
+				transform: rotate(45deg);
+			}
+		}
+
+	}
+
+	// 包件列表
+	.packageList {
+		background: #f5f5f6;
+		transition: all 0.3s;
+		overflow: hidden;
+
+		.packageItem {
+			$inputHeight: 80upx;
+
+			.inputBox {
+				position: relative;
+				border-radius: calc($inputHeight / 2);
+				overflow: hidden;
+				background: #fff;
+
+				.packageInput {
+					height: $inputHeight;
+					padding: 0 40upx;
+				}
+
+				.scanIcon {
+					padding: 0 20upx;
+					// position: absolute;
+					// right: 40upx;
+					// top: 50%;
+					// transform: translateY(-50%);
+				}
+			}
+		}
+	}
+
+	// 图片列表
+	.imgList {
+		flex-wrap: wrap;
+
+		.image_conatiner {
+			position: relative;
+
+			.removeIcon {
+				position: absolute;
+				top: 0;
+				right: 0;
+				transform: translate(40%, -40%);
+				opacity: 0.9;
+			}
+		}
+
+		.addImg {
+			width: 160upx;
+			height: 160upx;
+			border-radius: 20upx;
+			box-sizing: border-box;
+			border: 2upx solid #eee;
+		}
+
+		image {
+			width: 160upx;
+			height: 160upx;
+			border-radius: 20upx;
+		}
+	}
+
+	.button {
+		height: 80upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		// margin: 10upx;
+		// border: 2upx solid #b5babf;
+		border-radius: 80upx;
+		margin: 0 10upx;
+		padding: 0 10upx;
+		// font-size: 0.75rem;
+
+		&.subColor {
+			background-color: var(--subjectColor);
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue b/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue
index 47eba3e..ff9adc1 100644
--- a/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue
+++ b/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue
@@ -405,11 +405,11 @@
 				try {
 					option.pageLoading = true
 
-					const submitData = { type: details.form.type, install_id: details.pageInfo.id, remark: details.form.remark, images: details.imgList }
-					// for (let i = 0; i < details.packageList.length; i++) {
-					// 	const _item = details.packageList[i]
-					// 	_item && submitData.images.push(_item)
-					// }
+					const submitData = { type: details.form.type, install_id: details.pageInfo.id, remark: details.form.remark, images: details.imgList, packages: [] }
+					for (let i = 0; i < details.packageList.length; i++) {
+						const _item = details.packageList[i]
+						_item.code && submitData.packages.push(_item.code)
+					}
 
 					const res = await postInstallAfterSales(submitData)
 
diff --git a/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue b/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue
index b971266..a4ab450 100644
--- a/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue
+++ b/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue
@@ -269,12 +269,18 @@
 		// // #endif
 
 		await nextTick()
-
-		initpage()
-		// basicContainer.value.startPullDownRefresh()
 		const _height = await utils.getViewDistanceFormTop('.scvmabx')
 
 		details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px'
+	})
+
+	onLoad(async (e) => {
+		details.pageInfo.install_id = e.id
+
+		await initpage()
+		// basicContainer.value.startPullDownRefresh()
+
+		await nextTick()
 
 		if (utils.getObjType(imgPullDownRefList.value) !== 'array') return
 		for (let i = 0; i < imgPullDownRefList.value.length; i++) {
@@ -283,10 +289,6 @@
 		}
 	})
 
-	onLoad((e) => {
-		details.pageInfo.install_id = e.id
-	})
-
 	const scandata = () => { }
 
 	const initpage = async () => {
diff --git a/pagesHome/pages/addInfo/addInfo.vue b/pagesHome/pages/addInfo/addInfo.vue
index 434b747..28c9215 100644
--- a/pagesHome/pages/addInfo/addInfo.vue
+++ b/pagesHome/pages/addInfo/addInfo.vue
@@ -84,11 +84,16 @@
 					</view>
 				</view>
 
+				<!-- 站位容器 -->
+
 				<!-- 提交按钮 -->
 				<view class="submitButton" @click="handleSubmit">
 					提 交
 				</view>
 			</view>
+			<view class="footer_container">
+
+			</view>
 		</template>
 	</BasicContainer>
 
@@ -144,7 +149,8 @@
 	const option = reactive({
 		title: '添加信息',
 		haveData: true,
-		pageLoading: false
+		pageLoading: false,
+		haveReachBottom: false
 	})
 
 	const details = reactive({
@@ -667,8 +673,13 @@
 		color: #fff;
 		border-radius: 60upx;
 		position: fixed;
-		bottom: 10upx;
+		bottom: 60upx;
 		left: 50%;
 		transform: translateX(-50%);
 	}
+
+	// 底部站位
+	.footer_container {
+		height: 140upx;
+	}
 </style>
\ No newline at end of file
diff --git a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
index 5a1fe50..fc522f8 100644
--- a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
+++ b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue
@@ -87,9 +87,9 @@
 						确认完工
 					</view>
 
-					<!-- 					<view class="button errColor" @click="handleConfirmCompletion">
-						驳回
-					</view> -->
+					<view class="button primaryColor" @click="handleConfirmCompletion">
+						确认到货
+					</view>
 
 					<view class="button primaryColor" v-if="details.buttonPermissionObj.confirmSignfor"
 						@click="handleCheckAndAccept">
diff --git a/pagesHome/pages/checkAndAccept/checkAndAccept.vue b/pagesHome/pages/checkAndAccept/checkAndAccept.vue
index f03b0e2..4b77b95 100644
--- a/pagesHome/pages/checkAndAccept/checkAndAccept.vue
+++ b/pagesHome/pages/checkAndAccept/checkAndAccept.vue
@@ -98,6 +98,31 @@
 
 	<PopUp ref="checkPopUpRef">
 		<view class="pd20 mt20 row">
+			<!-- 验收图片 -->
+			<view class="mb20">
+				验收图片
+			</view>
+
+			<view class="flex imgList mb20">
+				<!-- 单个图片 -->
+				<block v-for="(item, index) in details.checkAndAcceptImgList" :key="item">
+					<view class="image_conatiner mr20 pd20">
+						<image :src="item.url" mode=""></image>
+
+						<!-- 删除 -->
+						<view class="removeIcon" @click="()=> handleRmove(index)">
+							<u-icon name="close-circle-fill" color="#666" size="50"></u-icon>
+						</view>
+					</view>
+				</block>
+
+				<!-- 添加图片 -->
+				<view class="image_conatiner addImg flex-c-c" @click="handleUploadFile">
+					<u-icon name="photo-fill" color="#999" size="100"></u-icon>
+				</view>
+			</view>
+
+			<!-- 备注 -->
 			<view class="mb20">验收备注</view>
 
 			<u-textarea v-model="details.form.reason" placeholder="请输入"></u-textarea>
@@ -192,6 +217,8 @@
 		],
 		imgList: [],
 		renderArr: [],
+		/** 验收图片 */
+		checkAndAcceptImgList: []
 	})
 
 	// 组件配置
@@ -255,6 +282,7 @@
 
 	const scandata = () => { }
 
+	/** 初始化获取数据 */
 	const initpage = async () => {
 		try {
 			option.pageLoading = true
@@ -317,6 +345,46 @@
 		}
 	}
 
+	/** 上传验收图片 */
+	/** 上传文件 */
+	const handleUploadFile = () => {
+		const successByUpload = (res) => {
+			console.log('res :>> ', res);
+			const { data } = res
+			const _data = JSON.parse(data)
+
+			console.log('_data :>> ', _data);
+			const { code, data: img } = _data
+
+			details.checkAndAcceptImgList.push({ url: img, name: img })
+		}
+
+		utils.handleUploadFile({
+			successByUpload
+		})
+	}
+
+	/** 移除图片 */
+	const handleRmove = (index) => {
+		tip.value.setdetails({
+			isshow: true,
+			content: '确认移除',
+			cancelTxt: '取消',
+			confirmTxt: '确认',
+			success() {
+				details.imgList.splice(index, 1)
+
+				// 关闭弹窗
+				tip.value.setdetails({ isshow: false })
+			},
+			cancel() {
+				// 关闭弹窗
+				tip.value.setdetails({ isshow: false })
+			}
+		})
+	}
+
+
 	/**
 	 * 提交
 	 * @param {number} result 结果 1 -- 通过, 0 -- 驳回
@@ -328,6 +396,7 @@
 			showPopUp: true,
 			title: '确认' + (result === 0 ? '驳回' : '通过'),
 			async success() {
+				if (result === 0 && details.checkAndAcceptImgList.length === 0) return utils.handleToast('最少上传一张驳回图片')
 				if (result === 0 && !details.form.reason) return utils.handleToast('请输入驳回原因')
 
 				try {
@@ -341,9 +410,12 @@
 						install_id ?: string
 						// 安装售后id
 						install_sales_id ?: string
+						// 验收图片
+						images : { url : string, name : string }[]
 					} = {
 							result,
 							reason: details.form.reason,
+							images: details.checkAndAcceptImgList
 						}
 
 					details.pageType === 'install'
@@ -372,58 +444,6 @@
 				}
 			},
 		})
-
-		// 	tip.value.setdetails({
-		// 		isshow: true,
-		// 		content: '确认' + (result === 0 ? '驳回' : '通过'),
-		// 		cancelTxt: '取 消',
-		// 		confirmTxt: '确 认',
-		// 		async success() {
-		// 			try {
-		// 				option.pageLoading = true
-		// 				const submitData : {
-		// 					// 验收或驳回
-		// 					result : number
-		// 					// 验收意见
-		// 					reason : string
-		// 					// 安装任务id
-		// 					install_id ?: string
-		// 					// 安装售后id
-		// 					install_sales_id ?: string
-		// 				} = {
-		// 						result,
-		// 						reason: details.form.reason,
-		// 					}
-
-		// 				details.pageType === 'install'
-		// 					? (submitData.install_id = details.pageInfo.install_id)
-		// 					: (submitData.install_sales_id = details.pageInfo.install_sales_id)
-
-		// 				const res =
-		// 					details.pageType === 'install'
-		// 						? // 安装验收
-		// 						await postInstallAcceptance(submitData)
-		// 						: // 售后验收
-		// 						await postInstallSalesAcceptance(submitData)
-
-		// 				const { code, data } = res
-
-		// 				if (code !== 200) return
-
-		// 				uni.navigateBack()
-		// 			} catch (err) {
-		// 				console.log('err :>> ', err)
-		// 				//TODO handle the exception
-		// 			} finally {
-		// 				option.pageLoading = false
-		// 				// 关闭弹窗
-		// 				tip.value.setdetails({ isshow: false })
-		// 			}
-		// 		},
-		// 		cancel() {
-		// 			tip.value.setdetails({ isshow: false })
-		// 		},
-		// 	})
 	}
 </script>
 
@@ -477,15 +497,46 @@
 		}
 
 		// 图片列表
-		.imgList {
-			flex-wrap: wrap;
+		// .imgList {
+		// 	flex-wrap: wrap;
+
+		// 	image {
+		// 		width: 160upx;
+		// 		height: 160upx;
+		// 		border-radius: 20upx;
+		// 	}
+		// }
+	}
 
-			image {
-				width: 160upx;
-				height: 160upx;
-				border-radius: 20upx;
+	// 图片列表
+	.imgList {
+		flex-wrap: wrap;
+
+		.image_conatiner {
+			position: relative;
+
+			.removeIcon {
+				position: absolute;
+				top: 0;
+				right: 0;
+				transform: translate(40%, -40%);
+				opacity: 0.9;
 			}
 		}
+
+		.addImg {
+			width: 160upx;
+			height: 160upx;
+			border-radius: 20upx;
+			box-sizing: border-box;
+			border: 2upx solid #eee;
+		}
+
+		image {
+			width: 160upx;
+			height: 160upx;
+			border-radius: 20upx;
+		}
 	}
 
 	// 底部
diff --git a/pagesHome/pages/taskDetails/clientInfo.vue b/pagesHome/pages/taskDetails/clientInfo.vue
index 6994583..39d33a6 100644
--- a/pagesHome/pages/taskDetails/clientInfo.vue
+++ b/pagesHome/pages/taskDetails/clientInfo.vue
@@ -144,7 +144,7 @@
 	/** 打电话 */
 	const handleCallPhone = () => {
 		uni.makePhoneCall({
-			phoneNumber: '13208366016'
+			phoneNumber: info.value.tel
 		})
 	}
 </script>
diff --git a/pagesHome/pages/taskDetails/nodeInfo.vue b/pagesHome/pages/taskDetails/nodeInfo.vue
index e37b023..5464ea7 100644
--- a/pagesHome/pages/taskDetails/nodeInfo.vue
+++ b/pagesHome/pages/taskDetails/nodeInfo.vue
@@ -32,6 +32,14 @@
 						<view class="time" v-if="item.remark">
 							{{item.remark}}
 						</view>
+
+						<view v-if="item.images && item.images.length > 0" class="mt10 flex flex-wrap">
+							<block v-for="val in item.images">
+								<view class="pd10">
+									<image :src="val.url" mode=""></image>
+								</view>
+							</block>
+						</view>
 					</view>
 				</view>
 			</block>
@@ -123,4 +131,10 @@
 			}
 		}
 	}
+
+	image {
+		width: 160upx;
+		height: 160upx;
+		border-radius: 10upx;
+	}
 </style>
\ No newline at end of file
diff --git a/pagesHome/pages/taskDetails/serviceContent.vue b/pagesHome/pages/taskDetails/serviceContent.vue
index 371d6f7..f5aefae 100644
--- a/pagesHome/pages/taskDetails/serviceContent.vue
+++ b/pagesHome/pages/taskDetails/serviceContent.vue
@@ -97,7 +97,7 @@
 											<view class="title">图片</view>
 											<view class="mt10 flex flex-wrap">
 												<block v-for="item in value.images">
-													<view class="mb20 mr20">
+													<view class="mb20 mr20" @click="()=> handleShowImg(item)">
 														<image :src="item.url" mode=""></image>
 													</view>
 												</block>
@@ -111,6 +111,8 @@
 				</PullDownBox>
 			</view>
 		</block>
+
+		<ShowImgBox v-model="details.showImg" :imgUrl="details.showImgUrl" />
 	</view>
 </template>
 
@@ -227,6 +229,11 @@
 		} else return []
 	})
 
+	const details = reactive({
+		showImg: false,
+		showImgUrl: ''
+	})
+
 	/** 新增服务内容 */
 	const handleAdd = item => {
 		console.log('item :>> ', item)
@@ -251,6 +258,11 @@
 				props.pageInfo.id,
 		})
 	}
+
+	const handleShowImg = (item) => {
+		details.showImg = true
+		details.showImgUrl = item.url
+	}
 </script>
 
 <style scoped lang="scss">
diff --git a/pagesUser/pages/InstallAfterSalesTaskList/InstallAfterSalesTaskList.vue b/pagesUser/pages/InstallAfterSalesTaskList/InstallAfterSalesTaskList.vue
index da52e3c..289aa5e 100644
--- a/pagesUser/pages/InstallAfterSalesTaskList/InstallAfterSalesTaskList.vue
+++ b/pagesUser/pages/InstallAfterSalesTaskList/InstallAfterSalesTaskList.vue
@@ -1,787 +1,789 @@
 <template>
-  <BasicContainer ref="basicContainer" :option="option">
-    <template #body>
-      <view class="main">
-        <!-- tabbar -->
-        <view class="tabbar flex" v-if="details.userInfo.role_code === '2'">
-          <view
-            :class="{
+	<BasicContainer ref="basicContainer" :option="option">
+		<template #body>
+			<view class="main">
+				<!-- tabbar -->
+				<view class="tabbar flex" v-if="details.userInfo.role_code === '2'">
+					<view :class="{
               tabbar_item: true,
               'flex-c-c': true,
               flex1: true,
               active: details.tabbarCode === 0,
-            }"
-            @click="() => handleClickTabbar(0)"
-          >
-            我的任务
-          </view>
-
-          <view
-            :class="{
+            }" @click="() => handleClickTabbar(0)">
+						我的任务
+					</view>
+
+					<view :class="{
               tabbar_item: true,
               'flex-c-c': true,
               flex1: true,
               active: details.tabbarCode === 1,
-            }"
-            @click="() => handleClickTabbar(1)"
-          >
-            下属任务
-          </view>
-
-          <view
-            class="tabbar_active flex-c-c"
-            :style="`transform: translateX(${details.tabbarCode * 100 + '%'})`"
-          >
-            <view class="line"></view>
-          </view>
-        </view>
-
-        <!-- 搜索区 -->
-        <view class="search_container">
-          <view class="input_container flex-c-sb">
-            <view class="first_icon flex-c-c">
-              <u-icon name="search" color="#999" size="45"></u-icon>
-            </view>
-
-            <MyInput
-              type="text"
-              class="flex1 h100"
-              :border="false"
-              v-model="details.searchText"
-              placeholder="请输入"
-              clearable
-            />
-
-            <view class="search_text flex-c-c" @click="handleSearch">搜 索</view>
-          </view>
-        </view>
-
-        <!-- 筛选区 -->
-        <view class="flex-c-sa search_row">
-          <!-- 大区 -->
-          <!-- <view class="flex1 flex-c-c" @click="() => handleShowChooseTime('year')">
+            }" @click="() => handleClickTabbar(1)">
+						下属任务
+					</view>
+
+					<view class="tabbar_active flex-c-c" :style="`transform: translateX(${details.tabbarCode * 100 + '%'})`">
+						<view class="line"></view>
+					</view>
+				</view>
+
+				<!-- 搜索区 -->
+				<view class="search_container">
+					<view class="input_container flex-c-sb">
+						<view class="first_icon flex-c-c">
+							<u-icon name="search" color="#999" size="45"></u-icon>
+						</view>
+
+						<MyInput type="text" class="flex1 h100" :border="false" v-model="details.searchText" placeholder="请输入"
+							clearable />
+
+						<view class="search_text flex-c-c" @click="handleSearch">搜 索</view>
+					</view>
+				</view>
+
+				<!-- 筛选区 -->
+				<view class="flex-c-sa search_row">
+					<!-- 大区 -->
+					<!-- <view class="flex1 flex-c-c" @click="() => handleShowChooseTime('year')">
 						<text class="mr10">
 							大区
 						</text>
 						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
 					</view> -->
 
-          <!-- 时间 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChooseTime()">
-            <text class="mr10">
-              {{
+					<!-- 时间 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChooseTime()">
+						<text class="mr10">
+							{{
                 details.time.year && details.time.month
                   ? details.time.year + '.' + details.time.month
                   : '时间'
               }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-
-          <!-- 类型 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('type')">
-            <text class="mr10">
-              {{ details.form.typeName || '类型' }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-
-          <!-- 状态 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('status')">
-            <text class="mr10">
-              {{ details.form.statusName || '状态' }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-        </view>
-
-        <scroll-view
-          class="scvmabx"
-          :style="{height: details.scrollheight}"
-          scroll-y="true"
-          @touchmove.stop
-          @scrolltolower="handleReachDown"
-        >
-          <view class="list_container">
-            <block v-for="(item, index) in details.renderData" :key="item.id">
-              <!-- 工人 -->
-              <template v-if="details.tabbarCode === 0">
-                <view
-                  :class="{box: true, first: false, second: true, third: false}"
-                  @click="() => handleGoDetails(item)"
-                >
-                  <view class="title flex-c-sb">
-                    <view class="">
-                      预计
-                      <text>{{ item.estimated_finish_time }}</text>
-                      完成
-                    </view>
-
-                    <view class="tip">{{ item.status_map }}</view>
-                  </view>
-
-                  <view class="info">
-                    <view class="">客户联系人：{{ item.name }}</view>
-
-                    <view class="mt20">指派人：{{ item.work_users }}</view>
-
-                    <view class="mt20">安装单号：{{ item.no }}</view>
-
-                    <view class="mt20 flex-c-sb">
-                      <text>任务类型：{{ item.typeName }}</text>
-
-                      <text>状态：{{ item.statusName }}</text>
-                    </view>
-                  </view>
-                </view>
-              </template>
-
-              <!-- 下属 -->
-              <template v-if="details.tabbarCode === 1">
-                <view
-                  :class="{box: true, first: false, second: true, third: false}"
-                  @click="() => handleGoDetails(item)"
-                >
-                  <view class="title flex-c-sb">
-                    <view class="">售后服务编号：{{ item.no }}</view>
-
-                    <view class="tip">{{ item.statusName }}</view>
-                  </view>
-
-                  <view class="info">
-                    <view class="flex-c-sb">
-                      <view>客户联系人：{{ item.name }}</view>
-                      <view>
-                        {{ item.typeName }}
-                      </view>
-                    </view>
-
-                    <view class="flex-c-sb mt10">
-                      <view>项目组名称：{{ item.name }}</view>
-                      <view>
-                        工长：
-                        {{ item.typeName }}
-                      </view>
-                    </view>
-
-                    <view class="flex-c-sb mt10">
-                      <view>售后服务人员：{{ item.work_users }}</view>
-                    </view>
-
-                    <view class="mt10">创建时间：{{ item.no }}</view>
-                  </view>
-                </view>
-              </template>
-            </block>
-          </view>
-        </scroll-view>
-      </view>
-    </template>
-  </BasicContainer>
-
-  <!-- 选择弹窗 -- 时间 -->
-  <MyDrawer ref="myDrawerByTime">
-    <template #content>
-      <picker-view
-        v-if="details.visible"
-        :indicator-style="details.indicatorStyle"
-        :immediate-change="true"
-        :value="details.value"
-        @change="bindChangeByTime"
-        class="picker-view"
-      >
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.years" :key="index">
-            {{ item }}
-          </view>
-        </picker-view-column>
-
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.months" :key="index">
-            {{ item }}
-          </view>
-        </picker-view-column>
-      </picker-view>
-    </template>
-  </MyDrawer>
-
-  <!-- 选择弹窗 -- 类型 | 状态 -->
-  <MyDrawer ref="myDrawer">
-    <template #content>
-      <picker-view
-        v-if="details.visible"
-        :indicator-style="details.indicatorStyle"
-        :immediate-change="true"
-        :value="details.value"
-        @change="bindChangeByTime"
-        class="picker-view"
-      >
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.pickerArr" :key="index">
-            {{ item.label }}
-          </view>
-        </picker-view-column>
-      </picker-view>
-    </template>
-  </MyDrawer>
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+
+					<!-- 类型 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('type')">
+						<text class="mr10">
+							{{ details.form.typeName || '类型' }}
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+
+					<!-- 状态 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('status')">
+						<text class="mr10">
+							{{ details.form.statusName || '状态' }}
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+				</view>
+
+				<scroll-view class="scvmabx" :style="{height: details.scrollheight}" scroll-y="true" @touchmove.stop
+					@scrolltolower="handleReachDown">
+					<view class="list_container">
+						<block v-for="(item, index) in details.renderData" :key="item.id">
+							<!-- 工人 -->
+							<template v-if="details.tabbarCode === 0">
+								<view :class="{box: true, first: false, second: true, third: false}"
+									@click="() => handleGoDetails(item)">
+									<view class="title flex-c-sb">
+										<view class="">售后服务编号：{{ item.no }}</view>
+
+										<view class="tip">{{ item.statusName }}</view>
+									</view>
+
+									<view class="info">
+										<view class="">客户联系人：{{ item.name }}</view>
+
+										<view class="mt20">指派人：{{ item.work_users }}</view>
+
+
+										<view class="mt20 flex-c-sb">
+											<text>任务类型：{{ item.typeName }}</text>
+
+										</view>
+									</view>
+								</view>
+							</template>
+
+							<!-- 下属 -->
+							<template v-if="details.tabbarCode === 1">
+								<view :class="{box: true, first: false, second: true, third: false}"
+									@click="() => handleGoDetails(item)">
+									<view class="title flex-c-sb">
+										<view class="">售后服务编号：{{ item.no }}</view>
+
+										<view class="tip">{{ item.statusName }}</view>
+									</view>
+
+									<view class="info">
+										<view class="flex-c-sb">
+											<view>客户联系人：{{ item.name }}</view>
+											<view>
+												{{ item.typeName }}
+											</view>
+										</view>
+
+										<view class="flex-c-sb mt10">
+											<view>项目组名称：{{ item.name }}</view>
+											<view>
+												工长：
+												{{ item.work_user_captain }}
+											</view>
+										</view>
+
+										<view class="flex-c-sb mt10">
+											<view>售后服务人员：{{ item.work_users }}</view>
+										</view>
+
+										<!-- <view class="mt10">创建时间：{{ item.no }}</view> -->
+									</view>
+								</view>
+							</template>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+		</template>
+	</BasicContainer>
+
+	<!-- 选择弹窗 -- 时间 -->
+	<MyDrawer ref="myDrawerByTime">
+		<template #content>
+			<picker-view v-if="details.visible" :indicator-style="details.indicatorStyle" :immediate-change="true"
+				:value="details.value" @change="bindChangeByTime" class="picker-view">
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.years" :key="index">
+						{{ item }}
+					</view>
+				</picker-view-column>
+
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.months" :key="index">
+						{{ item }}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</template>
+	</MyDrawer>
+
+	<!-- 选择弹窗 -- 类型 | 状态 -->
+	<MyDrawer ref="myDrawer">
+		<template #content>
+			<picker-view v-if="details.visible" :indicator-style="details.indicatorStyle" :immediate-change="true"
+				:value="details.value" @change="bindChangeByTime" class="picker-view">
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.pickerArr" :key="index">
+						{{ item.label }}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</template>
+	</MyDrawer>
 </template>
 
 <script lang="ts" setup>
-import {onLoad, onShow, onHide, onUnload, onPullDownRefresh} from '@dcloudio/uni-app'
-// import Tabber from '@/compoment/Tabber/Tabber.vue'
-import {nextTick, ref, reactive} from 'vue'
-import utils from '@/utils/utils'
-import {getCenterInstallSalesTaskList} from '@/api/user.js'
-
-// 组件实例
-const tip = ref(null)
-const myDrawerByTime = ref()
-const myDrawer = ref()
-const basicContainer = ref()
-
-const option = reactive({
-  // 标题
-  title: '下属售后任务',
-  // 下拉刷新回调函数
-  async pullDownRefreshInitPage() {
-    details.page.page = 1
-    details.renderData = []
-    details.page.isEnd = false
-    return await initPage()
-  },
-  // 触底加载回到函数
-  reachBottomInitPage: async () => {
-    return null
-  },
-  haveData: true,
-  isEnd: false,
-  pageLoading: false,
-})
-
-const details = reactive({
-  /** 列表容器高度 */
-  scrollheight: '60vh',
-  /** picker被选中的索引位置 */
-  value: [3],
-  /** picker行高度 */
-  indicatorStyle: `height: 40px;`,
-  /** 年 */
-  years: [],
-  /** 月 */
-  months: [],
-  /** 当前picker使用的数组 */
-  pickerArr: [],
-  /** 当前时间 */
-  time: {
-    year: '',
-    month: '',
-  },
-  form: {
-    /** 类型 */
-    type: '',
-    typeName: '',
-    /** 状态 */
-    status: '',
-    statusName: '',
-    /** 用户ID */
-    user_id: '',
-  },
-  /** 类型 */
-  typeArr: [
-    {label: '安装单', value: '0'},
-    {label: '合同安装单', value: '1'},
-    {label: '转安装单', value: '2'},
-    {label: '维修', value: '3'},
-  ],
-  /** 状态 */
-  statusArr: [
-    {label: '待报价', value: '1'},
-    {label: '待指派', value: '2'},
-    {label: '已指派', value: '3'},
-    {label: '服务中', value: '4'},
-    {label: '已完成', value: '5'},
-    {label: '验收', value: '6'},
-    {label: '已完结', value: '7'},
-    {label: '已关闭', value: '8'},
-  ],
-  visible: false,
-  pageType: 2,
-  /** 渲染数据 */
-  renderData: [],
-  /** 输入框搜索的值 */
-  searchText: '',
-  tabbarCode: 0,
-  /** 分页参数 */
-  page: {
-    page: 1,
-    page_size: 20,
-    total: 0,
-    // 是否加载完毕
-    isEnd: false,
-  },
-  userInfo: uni.getStorageSync('userInfo'),
-})
-
-onShow(async () => {
-  await nextTick()
-  details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
-  basicContainer.value.startPullDownRefresh()
-})
-onLoad(() => {
-  const _userInfo = uni.getStorageSync('userInfo')
-
-  // 当前角色是安装工人默认为查看自己，否则为查看下属
-  details.tabbarCode = ['1', '2'].includes(_userInfo.role_code) ? 0 : 1
-  if (_userInfo.role_code === '1') option.title = '我的售后任务'
-})
-
-// 初始化设置时间
-const initTime = () => {
-  // 获取当前时间
-  const now = new Date()
-  // 获取当前年份
-  const year = now.getFullYear()
-
-  for (let index = 1990; index <= year + 1; index++) {
-    details.years.push(index + '')
-  }
-
-  // 获取当前月份
-  // const month = now.getMonth() + 1
-  for (let index = 1; index <= 12; index++) {
-    details.months.push(index < 10 ? '0' + index : index + '')
-  }
-
-  // 设置默认时间
-  // details.time.year = year + ''
-  // details.time.month = month < 10 ? '0' + month : '' + month
-}
-
-initTime()
-
-/** 去详情 */
-const handleGoDetails = (item: any) => {
-  const jupPatch =
-    details.tabbarCode === 0
-      ? // 任务详情
-        '/pagesHome/pages/afterSalesDetails/afterSalesDetails?pageInfo=' + JSON.stringify(item)
-      : // 异常详情
-        '/pagesHome/pages/afterSalesDetails/afterSalesDetails?pageInfo=' + JSON.stringify(item)
-
-  uni.navigateTo({
-    url: jupPatch,
-  })
-}
-
-/** 转译 */
-const translationValue = (key, value) => {
-  let _value = {}
-
-  const _arr = details[key + 'Arr']
-
-  for (let i = 0; i < _arr.length; i++) {
-    const item = _arr[i]
-
-    if (value + '' !== item.value) continue
-    _value = item
-    break
-  }
-
-  return _value
-}
-
-/** 获取自身售后任务 */
-const handleGetTaskList = async submitData => {
-  const res = await getCenterInstallSalesTaskList(submitData)
-
-  const {code, data} = res
-  if (code === 200) {
-    details.renderData = [...details.renderData, ...(data || [])]
-
-    for (let i = 0; i < details.renderData.length; i++) {
-      const _value = details.renderData[i]
-
-      const {type, status} = _value
-
-      // if (type)
-      // 转译类型
-      const _itemType = translationValue('type', type)
-      _value.typeName = _itemType.label || '暂无'
-
-      const _itemStatus = translationValue('status', status)
-      _value.statusName = _itemStatus.label || '暂无'
-    }
-  }
-  return res
-}
-
-/** 获取下属列表 */
-const handleGetSubordinateList = async submitData => {
-  const res = await getCenterInstallSalesTaskList(submitData)
-
-  const {code, data} = res
-  if (code === 200) details.renderData = [...details.renderData, ...(data || [])]
-  return res
-}
-
-/** 获取页面数据 */
-const initPage = async () => {
-  try {
-    option.pageLoading = true
-
-    // details.renderData = []
-
-    const submitData: any = {
-      ...details.page,
-      is_my: details.tabbarCode === 0 ? 1 : 0,
-    }
-
-    // 时间
-    details.time.year &&
-      details.time.month &&
-      (submitData.month = details.time.year + '-' + details.time.month)
-
-    // 搜索的值
-    details.searchText && (submitData.search = details.searchText)
-
-    // 状态
-    details.form.status && (submitData.status = details.form.status)
-
-    // 类型
-    details.form.type && (submitData.type = details.form.type)
-
-    // 用户ID
-    details.form.user_id && (submitData.user_id = details.form.user_id)
-
-    const res =
-      details.tabbarCode === 0
-        ? await handleGetTaskList(submitData)
-        : await handleGetSubordinateList(submitData)
-
-    const {code, data} = res
-
-    if (code !== 200) return
-    if (utils.getObjType(data) !== 'array') return
-    if (data.length < details.page.page_size) details.page.isEnd = true
-  } catch (err) {
-    console.log('err :>> ', err)
-    //TODO handle the exception
-  } finally {
-    option.pageLoading = false
-  }
-}
-
-// initPage()
-
-/** tabbar点击事件 */
-const handleClickTabbar = (code: number) => {
-  details.tabbarCode = code
-  details.page.page = 1
-  details.page.isEnd = false
-  initPage()
-}
-
-const handleReachDown = () => {
-  if (details.page.isEnd) return
-
-  details.page.page++
-
-  initPage()
-}
-
-/** picker切换时执行 -- 时间 */
-const bindChangeByTime = function (e) {
-  console.log('e :>> ', e)
-  details.value = e.detail.value
-}
-
-const handleCloseNode = async Ref => {
-  Ref.value.details.showPopUp = false
-  await nextTick()
-  details.visible = false
-}
-
-/** 选择时间 */
-const handleShowChooseTime = async () => {
-  const {year, month} = details.time
-
-  const now = new Date()
-  const nowYear = now.getFullYear()
-  const nowMonth = now.getMonth() + 1
-
-  const _year = year ? year : nowYear + ''
-  const _month = month ? month : nowMonth < 10 ? '0' + nowMonth : '' + nowMonth
-  for (let i = 0; i < details.years.length; i++) {
-    const value = details.years[i]
-    if (value !== _year) continue
-    details.value[0] = i
-    break
-  }
-
-  for (let i = 0; i < details.months.length; i++) {
-    const value = details.months[i]
-    if (value !== _month) continue
-    details.value[1] = i
-    break
-  }
-
-  details.visible = false
-  await nextTick()
-  details.visible = true
-
-  myDrawerByTime.value.setDetails({
-    showPopUp: true,
-    title: '选择时间',
-    cancelText: '清空',
-    success() {
-      details.time.year = details.years[details.value[0]]
-      details.time.month = details.months[details.value[1]]
-      handleCloseNode(myDrawerByTime)
-      initPage()
-    },
-    close() {
-      details.time.year = ''
-      details.time.month = ''
-      handleCloseNode(myDrawerByTime)
-      initPage()
-    },
-    cancel() {
-      handleCloseNode(myDrawerByTime)
-    },
-  })
-}
-
-/** 选择状态 | 类型 */
-const handleShowChoosePicker = async (type: 'status' | 'type') => {
-  const _key = type + 'Arr'
-
-  details.pickerArr = details[_key]
-
-  let index = 0
-
-  for (let i = 0; i < details.pickerArr.length; i++) {
-    const _item = details.pickerArr[i]
-
-    if (_item.value !== details.form[type]) continue
-    index = i
-    break
-  }
-
-  details.value = [index]
-
-  console.log('details.value :>> ', details.value)
-  details.visible = false
-  await nextTick()
-  details.visible = true
-
-  myDrawer.value.setDetails({
-    showPopUp: true,
-    title: '选择' + (type === 'type' ? '类型' : '状态'),
-    cancelText: '清空',
-    success() {
-      const _item = details.pickerArr[details.value[0]]
-      details.form[type] = _item.value
-      details.form[type + 'Name'] = _item.label
-
-      console.log('details.form :>> ', details.form)
-
-      handleCloseNode(myDrawer)
-      initPage()
-    },
-    close() {
-      details.form[type] = ''
-      details.form[type + 'Name'] = ''
-      handleCloseNode(myDrawer)
-      initPage()
-    },
-    cancel() {
-      handleCloseNode(myDrawer)
-    },
-  })
-}
-
-/** 搜索 */
-const handleSearch = () => {
-  // uni.navigateTo({
-  // 	url: '/pagesUser/pages/InstallTaskList/InstallTaskList'
-  // })
-  initPage()
-}
+	import { onLoad, onShow, onHide, onUnload, onPullDownRefresh } from '@dcloudio/uni-app'
+	// import Tabber from '@/compoment/Tabber/Tabber.vue'
+	import { nextTick, ref, reactive } from 'vue'
+	import utils from '@/utils/utils'
+	import { getCenterInstallSalesTaskList } from '@/api/user.js'
+
+	// 组件实例
+	const tip = ref(null)
+	const myDrawerByTime = ref()
+	const myDrawer = ref()
+	const basicContainer = ref()
+
+	const option = reactive({
+		// 标题
+		title: '下属售后任务',
+		// 下拉刷新回调函数
+		async pullDownRefreshInitPage() {
+			details.page.page = 1
+			details.renderData = []
+			details.page.isEnd = false
+			return await initPage()
+		},
+		// 触底加载回到函数
+		reachBottomInitPage: async () => {
+			return null
+		},
+		haveData: true,
+		isEnd: false,
+		pageLoading: false,
+	})
+
+	const details = reactive({
+		/** 列表容器高度 */
+		scrollheight: '60vh',
+		/** picker被选中的索引位置 */
+		value: [3],
+		/** picker行高度 */
+		indicatorStyle: `height: 40px;`,
+		/** 年 */
+		years: [],
+		/** 月 */
+		months: [],
+		/** 当前picker使用的数组 */
+		pickerArr: [],
+		/** 当前时间 */
+		time: {
+			year: '',
+			month: '',
+		},
+		form: {
+			/** 类型 */
+			type: '',
+			typeName: '',
+			/** 状态 */
+			status: '',
+			statusName: '',
+			/** 用户ID */
+			user_id: '',
+		},
+		/** 类型 */
+		typeArr: [
+			// { label: '安装单', value: '0' },
+			// { label: '合同安装单', value: '1' },
+			// { label: '转安装单', value: '2' },
+			// { label: '维修', value: '3' },
+			{
+				label: '调试',
+				value: '1'
+			},
+			{
+				label: '维修',
+				value: '2'
+			},
+			{
+				label: '理赔',
+				value: '3'
+			},
+			{
+				label: '待确认',
+				value: '4'
+			}, {
+				label: '换货',
+				value: '5'
+			},
+			{
+				label: '工厂补单',
+				value: '6'
+			},
+		],
+		/** 状态 */
+		statusArr: [
+			{ label: '待报价', value: '1' },
+			{ label: '待指派', value: '2' },
+			{ label: '已指派', value: '3' },
+			{ label: '服务中', value: '4' },
+			{ label: '已完成', value: '5' },
+			{ label: '验收', value: '6' },
+			{ label: '已完结', value: '7' },
+			{ label: '已关闭', value: '8' },
+		],
+		visible: false,
+		pageType: 2,
+		/** 渲染数据 */
+		renderData: [],
+		/** 输入框搜索的值 */
+		searchText: '',
+		tabbarCode: 0,
+		/** 分页参数 */
+		page: {
+			page: 1,
+			page_size: 20,
+			total: 0,
+			// 是否加载完毕
+			isEnd: false,
+		},
+		userInfo: uni.getStorageSync('userInfo'),
+	})
+
+	onShow(async () => {
+		await nextTick()
+		details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
+		basicContainer.value.startPullDownRefresh()
+	})
+	onLoad(() => {
+		const _userInfo = uni.getStorageSync('userInfo')
+
+		// 当前角色是安装工人默认为查看自己，否则为查看下属
+		details.tabbarCode = ['1', '2'].includes(_userInfo.role_code) ? 0 : 1
+		if (_userInfo.role_code === '1') option.title = '我的售后任务'
+	})
+
+	// 初始化设置时间
+	const initTime = () => {
+		// 获取当前时间
+		const now = new Date()
+		// 获取当前年份
+		const year = now.getFullYear()
+
+		for (let index = 1990; index <= year + 1; index++) {
+			details.years.push(index + '')
+		}
+
+		// 获取当前月份
+		// const month = now.getMonth() + 1
+		for (let index = 1; index <= 12; index++) {
+			details.months.push(index < 10 ? '0' + index : index + '')
+		}
+
+		// 设置默认时间
+		// details.time.year = year + ''
+		// details.time.month = month < 10 ? '0' + month : '' + month
+	}
+
+	initTime()
+
+	/** 去详情 */
+	const handleGoDetails = (item : any) => {
+		const jupPatch =
+			details.tabbarCode === 0
+				? // 任务详情
+				'/pagesHome/pages/afterSalesDetails/afterSalesDetails?pageInfo=' + JSON.stringify(item)
+				: // 异常详情
+				'/pagesHome/pages/afterSalesDetails/afterSalesDetails?pageInfo=' + JSON.stringify(item)
+
+		uni.navigateTo({
+			url: jupPatch,
+		})
+	}
+
+	/** 转译 */
+	const translationValue = (key, value) => {
+		let _value = {}
+
+		const _arr = details[key + 'Arr']
+
+		for (let i = 0; i < _arr.length; i++) {
+			const item = _arr[i]
+
+			if (value + '' !== item.value) continue
+			_value = item
+			break
+		}
+
+		return _value
+	}
+
+	/** 获取自身售后任务 */
+	const handleGetTaskList = async submitData => {
+		const res = await getCenterInstallSalesTaskList(submitData)
+
+		const { code, data } = res
+		if (code === 200) {
+			details.renderData = [...details.renderData, ...(data || [])]
+
+			for (let i = 0; i < details.renderData.length; i++) {
+				const _value = details.renderData[i]
+
+				const { type, status } = _value
+
+				// if (type)
+				// 转译类型
+				const _itemType = translationValue('type', type)
+				_value.typeName = _itemType.label || '暂无'
+
+				const _itemStatus = translationValue('status', status)
+				_value.statusName = _itemStatus.label || '暂无'
+
+				console.log('_value :>> ', _value);
+			}
+		}
+		return res
+	}
+
+	/** 获取下属列表 */
+	const handleGetSubordinateList = async submitData => {
+		const res = await getCenterInstallSalesTaskList(submitData)
+
+		const { code, data } = res
+		if (code !== 200) return res
+		console.log('111 :>> ', 111);
+
+		details.renderData = [...details.renderData, ...(data || [])]
+
+		for (let i = 0; i < details.renderData.length; i++) {
+			const _value = details.renderData[i]
+
+			const { type, status } = _value
+
+			// if (type)
+			// 转译类型
+			const _itemType = translationValue('type', type)
+			_value.typeName = _itemType.label || '暂无'
+
+			const _itemStatus = translationValue('status', status)
+			_value.statusName = _itemStatus.label || '暂无'
+
+			console.log('_value :>> ', _value);
+		}
+
+		return res
+	}
+
+	/** 获取页面数据 */
+	const initPage = async () => {
+		try {
+			option.pageLoading = true
+
+			// details.renderData = []
+
+			const submitData : any = {
+				...details.page,
+				is_my: details.tabbarCode === 0 ? 1 : 0,
+			}
+
+			// 时间
+			details.time.year &&
+				details.time.month &&
+				(submitData.month = details.time.year + '-' + details.time.month)
+
+			// 搜索的值
+			details.searchText && (submitData.search = details.searchText)
+
+			// 状态
+			details.form.status && (submitData.status = details.form.status)
+
+			// 类型
+			details.form.type && (submitData.type = details.form.type)
+
+			// 用户ID
+			details.form.user_id && (submitData.user_id = details.form.user_id)
+
+			const res =
+				details.tabbarCode === 0
+					? await handleGetTaskList(submitData)
+					: await handleGetSubordinateList(submitData)
+
+			const { code, data } = res
+
+			if (code !== 200) return
+			if (utils.getObjType(data) !== 'array') return
+			if (data.length < details.page.page_size) details.page.isEnd = true
+		} catch (err) {
+			console.log('err :>> ', err)
+			//TODO handle the exception
+		} finally {
+			option.pageLoading = false
+		}
+	}
+
+	// initPage()
+
+	/** tabbar点击事件 */
+	const handleClickTabbar = (code : number) => {
+		details.tabbarCode = code
+		details.page.page = 1
+		details.page.isEnd = false
+		initPage()
+	}
+
+	const handleReachDown = () => {
+		if (details.page.isEnd) return
+
+		details.page.page++
+
+		initPage()
+	}
+
+	/** picker切换时执行 -- 时间 */
+	const bindChangeByTime = function (e) {
+		console.log('e :>> ', e)
+		details.value = e.detail.value
+	}
+
+	const handleCloseNode = async Ref => {
+		Ref.value.details.showPopUp = false
+		await nextTick()
+		details.visible = false
+	}
+
+	/** 选择时间 */
+	const handleShowChooseTime = async () => {
+		const { year, month } = details.time
+
+		const now = new Date()
+		const nowYear = now.getFullYear()
+		const nowMonth = now.getMonth() + 1
+
+		const _year = year ? year : nowYear + ''
+		const _month = month ? month : nowMonth < 10 ? '0' + nowMonth : '' + nowMonth
+		for (let i = 0; i < details.years.length; i++) {
+			const value = details.years[i]
+			if (value !== _year) continue
+			details.value[0] = i
+			break
+		}
+
+		for (let i = 0; i < details.months.length; i++) {
+			const value = details.months[i]
+			if (value !== _month) continue
+			details.value[1] = i
+			break
+		}
+
+		details.visible = false
+		await nextTick()
+		details.visible = true
+
+		myDrawerByTime.value.setDetails({
+			showPopUp: true,
+			title: '选择时间',
+			cancelText: '清空',
+			success() {
+				details.time.year = details.years[details.value[0]]
+				details.time.month = details.months[details.value[1]]
+				handleCloseNode(myDrawerByTime)
+				initPage()
+			},
+			close() {
+				details.time.year = ''
+				details.time.month = ''
+				handleCloseNode(myDrawerByTime)
+				initPage()
+			},
+			cancel() {
+				handleCloseNode(myDrawerByTime)
+			},
+		})
+	}
+
+	/** 选择状态 | 类型 */
+	const handleShowChoosePicker = async (type : 'status' | 'type') => {
+		const _key = type + 'Arr'
+
+		details.pickerArr = details[_key]
+
+		let index = 0
+
+		for (let i = 0; i < details.pickerArr.length; i++) {
+			const _item = details.pickerArr[i]
+
+			if (_item.value !== details.form[type]) continue
+			index = i
+			break
+		}
+
+		details.value = [index]
+
+		console.log('details.value :>> ', details.value)
+		details.visible = false
+		await nextTick()
+		details.visible = true
+
+		myDrawer.value.setDetails({
+			showPopUp: true,
+			title: '选择' + (type === 'type' ? '类型' : '状态'),
+			cancelText: '清空',
+			success() {
+				const _item = details.pickerArr[details.value[0]]
+				details.form[type] = _item.value
+				details.form[type + 'Name'] = _item.label
+
+				console.log('details.form :>> ', details.form)
+
+				handleCloseNode(myDrawer)
+				initPage()
+			},
+			close() {
+				details.form[type] = ''
+				details.form[type + 'Name'] = ''
+				handleCloseNode(myDrawer)
+				initPage()
+			},
+			cancel() {
+				handleCloseNode(myDrawer)
+			},
+		})
+	}
+
+	/** 搜索 */
+	const handleSearch = () => {
+		// uni.navigateTo({
+		// 	url: '/pagesUser/pages/InstallTaskList/InstallTaskList'
+		// })
+		initPage()
+	}
 </script>
 
 <style lang="scss" scoped>
-@import url('@/utils/style/common.scss');
-
-.header_title {
-  background-color: var(--subjectColor);
-  color: #fff;
-  height: 100upx;
-}
-
-// tabbar
-.tabbar {
-  height: 100upx;
-  background-color: #fff;
-  position: relative;
-  $tabbarTime: 0.3s;
-  font-size: 1rem;
-  border-bottom: 2upx solid #eee;
-
-  .tabbar_item {
-    font-weight: bold;
-    color: #000;
-    transition: all $tabbarTime;
-
-    &.active {
-      color: var(--subjectColor);
-    }
-  }
-
-  .tabbar_active {
-    height: 8upx;
-    position: absolute;
-    width: 50%;
-    bottom: 0;
-    transition: all $tabbarTime;
-
-    &::after {
-      content: '';
-      display: block;
-      width: 4rem;
-      height: 100%;
-      background-color: var(--subjectColor);
-      border-radius: 4upx;
-    }
-  }
-}
-
-// 顶部搜索
-.search_container {
-  background: #fff;
-  padding: 20upx;
-
-  .input_container {
-    // padding: 20upx 100upx;
-    background: #f4f6f8;
-    border-radius: 50upx;
-    height: 80upx;
-
-    .first_icon {
-      width: 100upx;
-    }
-
-    input {
-    }
-
-    .search_text {
-      width: 150upx;
-      color: var(--subjectColor);
-    }
-  }
-}
-
-// 搜索行
-.search_row {
-  background: #f5f5f6;
-  // border-bottom: 2upx solid #eee;
-
-  & > view {
-    padding: 20upx 0;
-  }
-}
-
-.main {
-  font-size: 0.9rem;
-  position: relative;
-  // padding: 20upx;
-
-  // 任务列表
-  .list_container {
-    position: relative;
-    color: #000;
-    z-index: 10;
-    // padding: 20upx;
-
-    // 工人样式
-    .box {
-      border-radius: 10upx;
-      overflow: hidden;
-      margin: 20upx;
-      position: relative;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .title {
-        padding: 20upx 20upx;
-        background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
-        font-weight: 600;
-
-        .tip {
-          font-weight: bold;
-          color: #3ad8bc;
-        }
-      }
-
-      .info {
-        padding: 30upx 20upx;
-        background-color: #fff;
-        font-size: 0.9rem;
-      }
-
-      //   .tip {
-      //     position: absolute;
-      //     padding: 10upx 20upx;
-      //     background-color: #f5f5f6;
-      //     color: var(--primaryColor);
-      //     right: 0;
-      //     top: 0;
-      //   }
-
-      // 待签收
-      &.first {
-        .title {
-          background: linear-gradient(90deg, #fee8d0 0%, #fff 100%);
-
-          .tip {
-            color: var(--subjectColor);
-          }
-        }
-      }
-
-      // 服务中
-      &.second {
-        .title {
-          background: linear-gradient(90deg, #cde7fc 0%, #fff 100%);
-
-          .tip {
-            color: var(--primaryColor);
-          }
-        }
-      }
-
-      // 已指派
-      &.third {
-        .title {
-          background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
-
-          .tip {
-            color: #3ad8bc;
-          }
-        }
-      }
-    }
-  }
-}
-
-// picker样式
-.picker-view {
-  height: 40vh;
-
-  .item {
-    text-align: center;
-    line-height: 40px;
-  }
-}
-</style>
+	@import url('@/utils/style/common.scss');
+
+	.header_title {
+		background-color: var(--subjectColor);
+		color: #fff;
+		height: 100upx;
+	}
+
+	// tabbar
+	.tabbar {
+		height: 100upx;
+		background-color: #fff;
+		position: relative;
+		$tabbarTime: 0.3s;
+		font-size: 1rem;
+		border-bottom: 2upx solid #eee;
+
+		.tabbar_item {
+			font-weight: bold;
+			color: #000;
+			transition: all $tabbarTime;
+
+			&.active {
+				color: var(--subjectColor);
+			}
+		}
+
+		.tabbar_active {
+			height: 8upx;
+			position: absolute;
+			width: 50%;
+			bottom: 0;
+			transition: all $tabbarTime;
+
+			&::after {
+				content: '';
+				display: block;
+				width: 4rem;
+				height: 100%;
+				background-color: var(--subjectColor);
+				border-radius: 4upx;
+			}
+		}
+	}
+
+	// 顶部搜索
+	.search_container {
+		background: #fff;
+		padding: 20upx;
+
+		.input_container {
+			// padding: 20upx 100upx;
+			background: #f4f6f8;
+			border-radius: 50upx;
+			height: 80upx;
+
+			.first_icon {
+				width: 100upx;
+			}
+
+			input {}
+
+			.search_text {
+				width: 150upx;
+				color: var(--subjectColor);
+			}
+		}
+	}
+
+	// 搜索行
+	.search_row {
+		background: #f5f5f6;
+		// border-bottom: 2upx solid #eee;
+
+		&>view {
+			padding: 20upx 0;
+		}
+	}
+
+	.main {
+		font-size: 0.9rem;
+		position: relative;
+		// padding: 20upx;
+
+		// 任务列表
+		.list_container {
+			position: relative;
+			color: #000;
+			z-index: 10;
+			// padding: 20upx;
+
+			// 工人样式
+			.box {
+				border-radius: 10upx;
+				overflow: hidden;
+				margin: 20upx;
+				position: relative;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.title {
+					padding: 20upx 20upx;
+					background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
+					font-weight: 600;
+
+					.tip {
+						font-weight: bold;
+						color: #3ad8bc;
+					}
+				}
+
+				.info {
+					padding: 30upx 20upx;
+					background-color: #fff;
+					font-size: 0.9rem;
+				}
+
+				//   .tip {
+				//     position: absolute;
+				//     padding: 10upx 20upx;
+				//     background-color: #f5f5f6;
+				//     color: var(--primaryColor);
+				//     right: 0;
+				//     top: 0;
+				//   }
+
+				// 待签收
+				&.first {
+					.title {
+						background: linear-gradient(90deg, #fee8d0 0%, #fff 100%);
+
+						.tip {
+							color: var(--subjectColor);
+						}
+					}
+				}
+
+				// 服务中
+				&.second {
+					.title {
+						background: linear-gradient(90deg, #cde7fc 0%, #fff 100%);
+
+						.tip {
+							color: var(--primaryColor);
+						}
+					}
+				}
+
+				// 已指派
+				&.third {
+					.title {
+						background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
+
+						.tip {
+							color: #3ad8bc;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// picker样式
+	.picker-view {
+		height: 40vh;
+
+		.item {
+			text-align: center;
+			line-height: 40px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesUser/pages/InstallTaskList/InstallTaskList.vue b/pagesUser/pages/InstallTaskList/InstallTaskList.vue
index 86a5278..c9392bd 100644
--- a/pagesUser/pages/InstallTaskList/InstallTaskList.vue
+++ b/pagesUser/pages/InstallTaskList/InstallTaskList.vue
@@ -1,792 +1,761 @@
 <template>
-  <BasicContainer ref="basicContainer" :option="option">
-    <template #body>
-      <view class="main">
-        <!-- tabbar -->
-        <view class="tabbar flex" v-if="details.userInfo.role_code === '2'">
-          <view
-            :class="{
+	<BasicContainer ref="basicContainer" :option="option">
+		<template #body>
+			<view class="main">
+				<!-- tabbar -->
+				<view class="tabbar flex" v-if="details.userInfo.role_code === '2'">
+					<view :class="{
               tabbar_item: true,
               'flex-c-c': true,
               flex1: true,
               active: details.tabbarCode === 0,
-            }"
-            @click="() => handleClickTabbar(0)"
-          >
-            我的任务
-          </view>
-
-          <view
-            :class="{
+            }" @click="() => handleClickTabbar(0)">
+						我的任务
+					</view>
+
+					<view :class="{
               tabbar_item: true,
               'flex-c-c': true,
               flex1: true,
               active: details.tabbarCode === 1,
-            }"
-            @click="() => handleClickTabbar(1)"
-          >
-            下属任务
-          </view>
-
-          <view
-            class="tabbar_active flex-c-c"
-            :style="`transform: translateX(${details.tabbarCode * 100 + '%'})`"
-          >
-            <view class="line"></view>
-          </view>
-        </view>
-
-        <!-- 搜索区 -->
-        <view class="search_container">
-          <view class="input_container flex-c-sb">
-            <view class="first_icon flex-c-c">
-              <u-icon name="search" color="#999" size="45"></u-icon>
-            </view>
-
-            <MyInput
-              type="text"
-              class="flex1 h100"
-              :border="false"
-              v-model="details.searchText"
-              placeholder="请输入"
-              clearable
-            />
-
-            <view class="search_text flex-c-c" @click="handleSearch">搜 索</view>
-          </view>
-        </view>
-
-        <!-- 筛选区 -->
-        <view class="flex-c-sa search_row">
-          <!-- 大区 -->
-          <!-- <view class="flex1 flex-c-c" @click="() => handleShowChooseTime('year')">
+            }" @click="() => handleClickTabbar(1)">
+						下属任务
+					</view>
+
+					<view class="tabbar_active flex-c-c" :style="`transform: translateX(${details.tabbarCode * 100 + '%'})`">
+						<view class="line"></view>
+					</view>
+				</view>
+
+				<!-- 搜索区 -->
+				<view class="search_container">
+					<view class="input_container flex-c-sb">
+						<view class="first_icon flex-c-c">
+							<u-icon name="search" color="#999" size="45"></u-icon>
+						</view>
+
+						<MyInput type="text" class="flex1 h100" :border="false" v-model="details.searchText" placeholder="请输入"
+							clearable />
+
+						<view class="search_text flex-c-c" @click="handleSearch">搜 索</view>
+					</view>
+				</view>
+
+				<!-- 筛选区 -->
+				<view class="flex-c-sa search_row">
+					<!-- 大区 -->
+					<!-- <view class="flex1 flex-c-c" @click="() => handleShowChooseTime('year')">
 						<text class="mr10">
 							大区
 						</text>
 						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
 					</view> -->
 
-          <!-- 时间 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChooseTime()">
-            <text class="mr10">
-              {{
+					<!-- 时间 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChooseTime()">
+						<text class="mr10">
+							{{
                 details.time.year && details.time.month
                   ? details.time.year + '.' + details.time.month
                   : '时间'
               }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-
-          <!-- 类型 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('type')">
-            <text class="mr10">
-              {{ details.form.typeName || '类型' }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-
-          <!-- 状态 -->
-          <view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('status')">
-            <text class="mr10">
-              {{ details.form.statusName || '状态' }}
-            </text>
-            <u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
-          </view>
-        </view>
-
-        <scroll-view
-          class="scvmabx"
-          :style="{height: details.scrollheight}"
-          @scrolltolower="() => {}"
-          scroll-y="true"
-          @touchmove.stop
-        >
-          <view class="list_container">
-            <!-- 工人 -->
-            <block v-for="(item, index) in details.renderData" :key="item.id">
-              <template v-if="details.tabbarCode === 0">
-                <view
-                  :class="{box: true, first: false, second: true, third: false}"
-                  @click="() => handleGoDetails(item)"
-                >
-                  <view class="title flex-c-sb">
-                    <view class="">
-                      预计
-                      <text>{{ item.estimated_finish_time }}</text>
-                      完成
-                    </view>
-
-                    <view class="tip">{{ item.status_map }}</view>
-                  </view>
-
-                  <view class="info">
-                    <view class="">客户联系人：{{ item.name }}</view>
-
-                    <view class="mt20">指派人：{{ item.work_users }}</view>
-
-                    <view class="mt20">安装单号：{{ item.no }}</view>
-
-                    <view class="mt20 flex-c-sb">
-                      <text>任务类型：{{ item.typeName }}</text>
-
-                      <text>状态：{{ item.statusName }}</text>
-                    </view>
-                  </view>
-                </view>
-              </template>
-
-              <!-- 下属 -->
-              <template v-if="details.tabbarCode === 1">
-                <view
-                  :class="{box: true, first: false, second: true, third: false}"
-                  @click="() => handleGoDetails(item)"
-                >
-                  <view class="title flex-c-sb">
-                    <view class="">任务编号：{{ item.no }}</view>
-
-                    <view class="tip">{{ item.statusName }}</view>
-                  </view>
-
-                  <view class="info">
-                    <view class="flex-c-sb">
-                      <view>客户联系人：{{ item.name }}</view>
-                      <view>
-                        {{ item.typeName }}
-                      </view>
-                    </view>
-
-                    <view class="flex-c-sb mt10">
-                      <view>项目组名称：{{ item.name }}</view>
-                      <view>
-                        工长：
-                        {{ item.typeName }}
-                      </view>
-                    </view>
-
-                    <view class="flex-c-sb mt10">
-                      <view>安装人员：{{ item.work_users }}</view>
-                    </view>
-
-                    <view class="mt10">创建时间：{{ item.no }}</view>
-                  </view>
-                </view>
-              </template>
-            </block>
-          </view>
-        </scroll-view>
-      </view>
-    </template>
-  </BasicContainer>
-
-  <!-- 选择弹窗 -- 时间 -->
-  <MyDrawer ref="myDrawerByTime">
-    <template #content>
-      <picker-view
-        v-if="details.visible"
-        :indicator-style="details.indicatorStyle"
-        :immediate-change="true"
-        :value="details.value"
-        @change="bindChangeByTime"
-        class="picker-view"
-      >
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.years" :key="index">
-            {{ item }}
-          </view>
-        </picker-view-column>
-
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.months" :key="index">
-            {{ item }}
-          </view>
-        </picker-view-column>
-      </picker-view>
-    </template>
-  </MyDrawer>
-
-  <!-- 选择弹窗 -- 类型 | 状态 -->
-  <MyDrawer ref="myDrawer">
-    <template #content>
-      <picker-view
-        v-if="details.visible"
-        :indicator-style="details.indicatorStyle"
-        :immediate-change="true"
-        :value="details.value"
-        @change="bindChangeByTime"
-        class="picker-view"
-      >
-        <picker-view-column>
-          <view class="item" v-for="(item, index) in details.pickerArr" :key="index">
-            {{ item.label }}
-          </view>
-        </picker-view-column>
-      </picker-view>
-    </template>
-  </MyDrawer>
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+
+					<!-- 类型 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('type')">
+						<text class="mr10">
+							{{ details.form.typeName || '类型' }}
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+
+					<!-- 状态 -->
+					<view class="flex1 flex-c-c" @click="() => handleShowChoosePicker('status')">
+						<text class="mr10">
+							{{ details.form.statusName || '状态' }}
+						</text>
+						<u-icon name="arrow-down-fill" color="#000" size="20"></u-icon>
+					</view>
+				</view>
+
+				<scroll-view class="scvmabx" :style="{height: details.scrollheight}" @scrolltolower="() => {}"
+					scroll-y="true" @touchmove.stop>
+					<view class="list_container">
+						<!-- 工人 -->
+						<block v-for="(item, index) in details.renderData" :key="item.id">
+							<template v-if="details.tabbarCode === 0">
+								<view :class="{box: true, first: false, second: true, third: false}"
+									@click="() => handleGoDetails(item)">
+									<view class="title flex-c-sb">
+										<!-- 										<view class="">
+											预计
+											<text>{{ item.estimated_finish_time }}</text>
+											完成
+										</view>
+
+										<view class="tip">{{ item.status_map }}</view> -->
+
+										<view class="">任务编号：{{ item.no }}</view>
+
+										<view class="tip">{{ item.statusName }}</view>
+									</view>
+
+									<view class="info">
+										<view class="">客户联系人：{{ item.name }}</view>
+
+										<view class="mt20">指派人：{{ item.work_users }}</view>
+
+										<!-- <view class="mt20">安装单号：{{ item.no }}</view> -->
+
+										<view class="mt20 flex-c-sb">
+											<text>任务类型：{{ item.typeName }}</text>
+										</view>
+
+										<view class="mt20 flex-c-sb">
+											<text>预计完成时间：{{ item.expect_install_time }}</text>
+										</view>
+									</view>
+								</view>
+							</template>
+
+							<!-- 下属 -->
+							<template v-if="details.tabbarCode === 1">
+								<view :class="{box: true, first: false, second: true, third: false}"
+									@click="() => handleGoDetails(item)">
+									<view class="title flex-c-sb">
+										<view class="">任务编号：{{ item.no }}</view>
+
+										<view class="tip">{{ item.statusName }}</view>
+									</view>
+
+									<view class="info">
+										<view class="flex-c-sb">
+											<view>客户联系人：{{ item.name }}</view>
+											<view>
+												{{ item.typeName }}
+											</view>
+										</view>
+
+										<view class="flex-c-sb mt10">
+											<view>项目组名称：{{ item.name }}</view>
+											<view>
+												工长：
+												{{ item.work_user_captain }}
+											</view>
+										</view>
+
+										<view class="flex-c-sb mt10">
+											<view>安装人员：{{ item.work_users }}</view>
+										</view>
+
+										<view class="mt10">预计完成时间：{{ item.expect_install_time }}</view>
+									</view>
+								</view>
+							</template>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+		</template>
+	</BasicContainer>
+
+	<!-- 选择弹窗 -- 时间 -->
+	<MyDrawer ref="myDrawerByTime">
+		<template #content>
+			<picker-view v-if="details.visible" :indicator-style="details.indicatorStyle" :immediate-change="true"
+				:value="details.value" @change="bindChangeByTime" class="picker-view">
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.years" :key="index">
+						{{ item }}
+					</view>
+				</picker-view-column>
+
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.months" :key="index">
+						{{ item }}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</template>
+	</MyDrawer>
+
+	<!-- 选择弹窗 -- 类型 | 状态 -->
+	<MyDrawer ref="myDrawer">
+		<template #content>
+			<picker-view v-if="details.visible" :indicator-style="details.indicatorStyle" :immediate-change="true"
+				:value="details.value" @change="bindChangeByTime" class="picker-view">
+				<picker-view-column>
+					<view class="item" v-for="(item, index) in details.pickerArr" :key="index">
+						{{ item.label }}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</template>
+	</MyDrawer>
 </template>
 
 <script lang="ts" setup>
-import {onLoad, onShow, onHide, onUnload, onPullDownRefresh} from '@dcloudio/uni-app'
-// import Tabber from '@/compoment/Tabber/Tabber.vue'
-import {nextTick, ref, reactive} from 'vue'
-import utils from '@/utils/utils'
-import {getCneterInstallTaskList} from '@/api/user.js'
-
-// 组件实例
-const tip = ref(null)
-const myDrawerByTime = ref()
-const myDrawer = ref()
-const basicContainer = ref()
-
-const option = reactive({
-  // 标题
-  title: '下属安装任务',
-  // 下拉刷新回调函数
-  async pullDownRefreshInitPage() {
-    details.page.page = 1
-    details.renderData = []
-    details.page.isEnd = false
-    return await initPage()
-  },
-  // 触底加载回到函数
-  reachBottomInitPage: async () => {
-    return null
-  },
-  haveData: true,
-  isEnd: false,
-  pageLoading: false,
-})
-
-const details = reactive({
-  /** 列表容器高度 */
-  scrollheight: '60vh',
-  /** picker被选中的索引位置 */
-  value: [3],
-  /** picker行高度 */
-  indicatorStyle: `height: 40px;`,
-  /** 年 */
-  years: [],
-  /** 月 */
-  months: [],
-  /** 当前picker使用的数组 */
-  pickerArr: [],
-  /** 当前时间 */
-  time: {
-    year: '',
-    month: '',
-  },
-  form: {
-    /** 类型 */
-    type: '',
-    typeName: '',
-    /** 状态 */
-    status: '',
-    statusName: '',
-    /** 用户ID */
-    user_id: '',
-  },
-  /** 类型 */
-  typeArr: [
-    {label: '安装单', value: '0'},
-    {label: '合同安装单', value: '1'},
-    {label: '转安装单', value: '2'},
-    {label: '维修', value: '3'},
-  ],
-  /** 状态 */
-  statusArr: [
-    {label: '待报价', value: '1'},
-    {label: '待指派', value: '2'},
-    {label: '已指派', value: '3'},
-    {label: '服务中', value: '4'},
-    {label: '已完成', value: '5'},
-    {label: '验收', value: '6'},
-    {label: '已完结', value: '7'},
-    {label: '已关闭', value: '8'},
-  ],
-  visible: false,
-  pageType: 2,
-  /** 渲染数据 */
-  renderData: [],
-  /** 输入框搜索的值 */
-  searchText: '',
-  tabbarCode: 0,
-  /** 分页参数 */
-  page: {
-    page: 1,
-    page_size: 20,
-    total: 0,
-    // 是否加载完毕
-    isEnd: false,
-  },
-  userInfo: uni.getStorageSync('userInfo'),
-})
-
-onShow(async () => {
-  await nextTick()
-  details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
-  basicContainer.value.startPullDownRefresh()
-})
-
-onLoad(() => {
-  const _userInfo = uni.getStorageSync('userInfo')
-
-  // 当前角色是安装工人默认为查看自己，否则为查看下属
-  details.tabbarCode = ['1', '2'].includes(_userInfo.role_code) ? 0 : 1
-  if (_userInfo.role_code === '1') option.title = '我的安装任务'
-})
-
-// 初始化设置时间
-const initTime = () => {
-  // 获取当前时间
-  const now = new Date()
-  // 获取当前年份
-  const year = now.getFullYear()
-
-  for (let index = 1990; index <= year + 1; index++) {
-    details.years.push(index + '')
-  }
-
-  // 获取当前月份
-  // const month = now.getMonth() + 1
-  for (let index = 1; index <= 12; index++) {
-    details.months.push(index < 10 ? '0' + index : index + '')
-  }
-
-  // 设置默认时间
-  // details.time.year = year + ''
-  // details.time.month = month < 10 ? '0' + month : '' + month
-}
-
-initTime()
-
-/** 去详情 */
-const handleGoDetails = (item: any) => {
-  const jupPatch =
-    // details.tabbarCode === 0
-    // ? // 任务详情
-    '/pagesHome/pages/taskDetails/taskDetails?pageInfo=' + JSON.stringify(item)
-  // : // 异常详情
-  // '/pagesHome/pages/afterSalesDetails/afterSalesDetails'
-
-  uni.navigateTo({
-    url: jupPatch,
-  })
-}
-
-/** 转译 */
-const translationValue = (key, value) => {
-  let _value = {}
-
-  const _arr = details[key + 'Arr']
-
-  for (let i = 0; i < _arr.length; i++) {
-    const item = _arr[i]
-
-    if (value + '' !== item.value) continue
-    _value = item
-    break
-  }
-
-  return _value
-}
-
-/** 获取安装任务 */
-const handleGetTaskList = async submitData => {
-  const res = await getCneterInstallTaskList(submitData)
-
-  const {code, data} = res
-
-  if (code === 200) {
-    details.renderData = [...details.renderData, ...(data || [])]
-
-    for (let i = 0; i < details.renderData.length; i++) {
-      const _value = details.renderData[i]
-
-      const {type, status} = _value
-
-      // if (type)
-      // 转译类型
-      const _itemType = translationValue('type', type)
-      _value.typeName = _itemType.label || '暂无'
-
-      const _itemStatus = translationValue('status', status)
-      _value.statusName = _itemStatus.label || '暂无'
-    }
-  }
-  return res
-}
-
-/** 获取下属列表 */
-const handleGetSubordinateList = async submitData => {
-  const res = await getCneterInstallTaskList(submitData)
-
-  const {code, data} = res
-  if (code !== 200) return
-  console.log('data :>> ', data)
-
-  details.renderData = data || []
-
-  if (code === 200) {
-    details.renderData = [...details.renderData, ...(data || [])]
-
-    for (let i = 0; i < details.renderData.length; i++) {
-      const _value = details.renderData[i]
-
-      const {type, status} = _value
-
-      // if (type)
-      // 转译类型
-      const _itemType = translationValue('type', type)
-      _value.typeName = _itemType.label || '暂无'
-
-      const _itemStatus = translationValue('status', status)
-      _value.statusName = _itemStatus.label || '暂无'
-    }
-  }
-  return res
-}
-
-/** 获取页面数据 */
-const initPage = async () => {
-  try {
-    option.pageLoading = true
-
-    details.renderData = []
-
-    const submitData: any = {
-      ...details.page,
-      is_my: details.tabbarCode === 0 ? 1 : 0,
-    }
-
-    // 时间
-    details.time.year &&
-      details.time.month &&
-      (submitData.month = details.time.year + '-' + details.time.month)
-
-    // 搜索的值
-    details.searchText && (submitData.search = details.searchText)
-
-    // 状态
-    details.form.status && (submitData.status = details.form.status)
-
-    // 类型
-    details.form.type && (submitData.type = details.form.type)
-
-    // 用户ID
-    details.form.user_id && (submitData.user_id = details.form.user_id)
-
-    const res =
-      details.tabbarCode === 0
-        ? await handleGetTaskList(submitData)
-        : await handleGetSubordinateList(submitData)
-
-    const {code, data} = res
-
-    if (code !== 200) return
-    if (utils.getObjType(data) !== 'array') return
-    if (data.length < details.page.page_size) details.page.isEnd = true
-  } catch (err) {
-    console.log('err :>> ', err)
-    //TODO handle the exception
-  } finally {
-    option.pageLoading = false
-  }
-}
-
-// initPage()
-
-/** tabbar点击事件 */
-const handleClickTabbar = (code: number) => {
-  details.tabbarCode = code
-  details.page.page = 1
-  details.page.isEnd = false
-  initPage()
-}
-
-/** picker切换时执行 -- 时间 */
-const bindChangeByTime = function (e) {
-  console.log('e :>> ', e)
-  details.value = e.detail.value
-}
-
-const handleCloseNode = async Ref => {
-  Ref.value.details.showPopUp = false
-  await nextTick()
-  details.visible = false
-}
-
-/** 选择时间 */
-const handleShowChooseTime = async () => {
-  const {year, month} = details.time
-
-  const now = new Date()
-  const nowYear = now.getFullYear()
-  const nowMonth = now.getMonth() + 1
-
-  const _year = year ? year : nowYear + ''
-  const _month = month ? month : nowMonth < 10 ? '0' + nowMonth : '' + nowMonth
-  for (let i = 0; i < details.years.length; i++) {
-    const value = details.years[i]
-    if (value !== _year) continue
-    details.value[0] = i
-    break
-  }
-
-  for (let i = 0; i < details.months.length; i++) {
-    const value = details.months[i]
-    if (value !== _month) continue
-    details.value[1] = i
-    break
-  }
-
-  details.visible = false
-  await nextTick()
-  details.visible = true
-
-  myDrawerByTime.value.setDetails({
-    showPopUp: true,
-    title: '选择时间',
-    cancelText: '清空',
-    success() {
-      details.time.year = details.years[details.value[0]]
-      details.time.month = details.months[details.value[1]]
-      handleCloseNode(myDrawerByTime)
-      initPage()
-    },
-    close() {
-      details.time.year = ''
-      details.time.month = ''
-      handleCloseNode(myDrawerByTime)
-      initPage()
-    },
-    cancel() {
-      handleCloseNode(myDrawerByTime)
-    },
-  })
-}
-
-/** 选择状态 | 类型 */
-const handleShowChoosePicker = async (type: 'status' | 'type') => {
-  const _key = type + 'Arr'
-
-  details.pickerArr = details[_key]
-
-  let index = 0
-
-  for (let i = 0; i < details.pickerArr.length; i++) {
-    const _item = details.pickerArr[i]
-
-    if (_item.value !== details.form[type]) continue
-    index = i
-    break
-  }
-
-  details.value = [index]
-
-  console.log('details.value :>> ', details.value)
-  details.visible = false
-  await nextTick()
-  details.visible = true
-
-  myDrawer.value.setDetails({
-    showPopUp: true,
-    title: '选择' + (type === 'type' ? '类型' : '状态'),
-    cancelText: '清空',
-    success() {
-      const _item = details.pickerArr[details.value[0]]
-      details.form[type] = _item.value
-      details.form[type + 'Name'] = _item.label
-
-      console.log('details.form :>> ', details.form)
-
-      handleCloseNode(myDrawer)
-      initPage()
-    },
-    close() {
-      details.form[type] = ''
-      details.form[type + 'Name'] = ''
-      handleCloseNode(myDrawer)
-      initPage()
-    },
-    cancel() {
-      handleCloseNode(myDrawer)
-    },
-  })
-}
-
-/** 搜索 */
-const handleSearch = () => {
-  // uni.navigateTo({
-  // 	url: '/pagesUser/pages/InstallTaskList/InstallTaskList'
-  // })
-  initPage()
-}
+	import { onLoad, onShow, onHide, onUnload, onPullDownRefresh } from '@dcloudio/uni-app'
+	// import Tabber from '@/compoment/Tabber/Tabber.vue'
+	import { nextTick, ref, reactive } from 'vue'
+	import utils from '@/utils/utils'
+	import { getCneterInstallTaskList } from '@/api/user.js'
+
+	// 组件实例
+	const tip = ref(null)
+	const myDrawerByTime = ref()
+	const myDrawer = ref()
+	const basicContainer = ref()
+
+	const option = reactive({
+		// 标题
+		title: '下属安装任务',
+		// 下拉刷新回调函数
+		async pullDownRefreshInitPage() {
+			details.page.page = 1
+			details.renderData = []
+			details.page.isEnd = false
+			return await initPage()
+		},
+		// 触底加载回到函数
+		reachBottomInitPage: async () => {
+			return null
+		},
+		haveData: true,
+		isEnd: false,
+		pageLoading: false,
+	})
+
+	const details = reactive({
+		/** 列表容器高度 */
+		scrollheight: '60vh',
+		/** picker被选中的索引位置 */
+		value: [3],
+		/** picker行高度 */
+		indicatorStyle: `height: 40px;`,
+		/** 年 */
+		years: [],
+		/** 月 */
+		months: [],
+		/** 当前picker使用的数组 */
+		pickerArr: [],
+		/** 当前时间 */
+		time: {
+			year: '',
+			month: '',
+		},
+		form: {
+			/** 类型 */
+			type: '',
+			typeName: '',
+			/** 状态 */
+			status: '',
+			statusName: '',
+			/** 用户ID */
+			user_id: '',
+		},
+		/** 类型 */
+		typeArr: [
+			{ label: '安装单', value: '0' },
+			{ label: '合同安装单', value: '1' },
+			{ label: '转安装单', value: '2' },
+			{ label: '维修', value: '3' },
+		],
+		/** 状态 */
+		statusArr: [
+			{ label: '待报价', value: '1' },
+			{ label: '待指派', value: '2' },
+			{ label: '已指派', value: '3' },
+			{ label: '服务中', value: '4' },
+			{ label: '已完成', value: '5' },
+			{ label: '验收', value: '6' },
+			{ label: '已完结', value: '7' },
+			{ label: '已关闭', value: '8' },
+		],
+		visible: false,
+		pageType: 2,
+		/** 渲染数据 */
+		renderData: [],
+		/** 输入框搜索的值 */
+		searchText: '',
+		tabbarCode: 0,
+		/** 分页参数 */
+		page: {
+			page: 1,
+			page_size: 20,
+			total: 0,
+			// 是否加载完毕
+			isEnd: false,
+		},
+		userInfo: uni.getStorageSync('userInfo'),
+	})
+
+	onShow(async () => {
+		await nextTick()
+		details.scrollheight = await utils.getViewDistanceFormTop('.scvmabx')
+		basicContainer.value.startPullDownRefresh()
+	})
+
+	onLoad(() => {
+		const _userInfo = uni.getStorageSync('userInfo')
+
+		// 当前角色是安装工人默认为查看自己，否则为查看下属
+		details.tabbarCode = ['1', '2'].includes(_userInfo.role_code) ? 0 : 1
+		if (_userInfo.role_code === '1') option.title = '我的安装任务'
+	})
+
+	// 初始化设置时间
+	const initTime = () => {
+		// 获取当前时间
+		const now = new Date()
+		// 获取当前年份
+		const year = now.getFullYear()
+
+		for (let index = 1990; index <= year + 1; index++) {
+			details.years.push(index + '')
+		}
+
+		// 获取当前月份
+		// const month = now.getMonth() + 1
+		for (let index = 1; index <= 12; index++) {
+			details.months.push(index < 10 ? '0' + index : index + '')
+		}
+
+		// 设置默认时间
+		// details.time.year = year + ''
+		// details.time.month = month < 10 ? '0' + month : '' + month
+	}
+
+	initTime()
+
+	/** 去详情 */
+	const handleGoDetails = (item : any) => {
+		const jupPatch =
+			// details.tabbarCode === 0
+			// ? // 任务详情
+			'/pagesHome/pages/taskDetails/taskDetails?pageInfo=' + JSON.stringify(item)
+		// : // 异常详情
+		// '/pagesHome/pages/afterSalesDetails/afterSalesDetails'
+
+		uni.navigateTo({
+			url: jupPatch,
+		})
+	}
+
+	/** 转译 */
+	const translationValue = (key, value) => {
+		let _value = {}
+
+		const _arr = details[key + 'Arr']
+
+		for (let i = 0; i < _arr.length; i++) {
+			const item = _arr[i]
+
+			if (value + '' !== item.value) continue
+			_value = item
+			break
+		}
+
+		return _value
+	}
+
+	/** 获取安装任务 */
+	const handleGetTaskList = async submitData => {
+		const res = await getCneterInstallTaskList(submitData)
+
+		const { code, data } = res
+
+		if (code === 200) {
+			details.renderData = [...details.renderData, ...(data || [])]
+
+			for (let i = 0; i < details.renderData.length; i++) {
+				const _value = details.renderData[i]
+
+				const { type, status } = _value
+
+				// if (type)
+				// 转译类型
+				const _itemType = translationValue('type', type)
+				_value.typeName = _itemType.label || '暂无'
+
+				const _itemStatus = translationValue('status', status)
+				_value.statusName = _itemStatus.label || '暂无'
+			}
+		}
+		return res
+	}
+
+	/** 获取下属列表 */
+	const handleGetSubordinateList = async submitData => {
+		const res = await getCneterInstallTaskList(submitData)
+
+		const { code, data } = res
+		if (code !== 200) return
+		console.log('data :>> ', data)
+
+		details.renderData = data || []
+
+		if (code === 200) {
+			details.renderData = [...details.renderData, ...(data || [])]
+
+			for (let i = 0; i < details.renderData.length; i++) {
+				const _value = details.renderData[i]
+
+				const { type, status } = _value
+
+				// if (type)
+				// 转译类型
+				const _itemType = translationValue('type', type)
+				_value.typeName = _itemType.label || '暂无'
+
+				const _itemStatus = translationValue('status', status)
+				_value.statusName = _itemStatus.label || '暂无'
+			}
+		}
+		return res
+	}
+
+	/** 获取页面数据 */
+	const initPage = async () => {
+		try {
+			option.pageLoading = true
+
+			details.renderData = []
+
+			const submitData : any = {
+				...details.page,
+				is_my: details.tabbarCode === 0 ? 1 : 0,
+			}
+
+			// 时间
+			details.time.year &&
+				details.time.month &&
+				(submitData.month = details.time.year + '-' + details.time.month)
+
+			// 搜索的值
+			details.searchText && (submitData.search = details.searchText)
+
+			// 状态
+			details.form.status && (submitData.status = details.form.status)
+
+			// 类型
+			details.form.type && (submitData.type = details.form.type)
+
+			// 用户ID
+			details.form.user_id && (submitData.user_id = details.form.user_id)
+
+			const res =
+				details.tabbarCode === 0
+					? await handleGetTaskList(submitData)
+					: await handleGetSubordinateList(submitData)
+
+			const { code, data } = res
+
+			if (code !== 200) return
+			if (utils.getObjType(data) !== 'array') return
+			if (data.length < details.page.page_size) details.page.isEnd = true
+		} catch (err) {
+			console.log('err :>> ', err)
+			//TODO handle the exception
+		} finally {
+			option.pageLoading = false
+		}
+	}
+
+	// initPage()
+
+	/** tabbar点击事件 */
+	const handleClickTabbar = (code : number) => {
+		details.tabbarCode = code
+		details.page.page = 1
+		details.page.isEnd = false
+		initPage()
+	}
+
+	/** picker切换时执行 -- 时间 */
+	const bindChangeByTime = function (e) {
+		console.log('e :>> ', e)
+		details.value = e.detail.value
+	}
+
+	const handleCloseNode = async Ref => {
+		Ref.value.details.showPopUp = false
+		await nextTick()
+		details.visible = false
+	}
+
+	/** 选择时间 */
+	const handleShowChooseTime = async () => {
+		const { year, month } = details.time
+
+		const now = new Date()
+		const nowYear = now.getFullYear()
+		const nowMonth = now.getMonth() + 1
+
+		const _year = year ? year : nowYear + ''
+		const _month = month ? month : nowMonth < 10 ? '0' + nowMonth : '' + nowMonth
+		for (let i = 0; i < details.years.length; i++) {
+			const value = details.years[i]
+			if (value !== _year) continue
+			details.value[0] = i
+			break
+		}
+
+		for (let i = 0; i < details.months.length; i++) {
+			const value = details.months[i]
+			if (value !== _month) continue
+			details.value[1] = i
+			break
+		}
+
+		details.visible = false
+		await nextTick()
+		details.visible = true
+
+		myDrawerByTime.value.setDetails({
+			showPopUp: true,
+			title: '选择时间',
+			cancelText: '清空',
+			success() {
+				details.time.year = details.years[details.value[0]]
+				details.time.month = details.months[details.value[1]]
+				handleCloseNode(myDrawerByTime)
+				initPage()
+			},
+			close() {
+				details.time.year = ''
+				details.time.month = ''
+				handleCloseNode(myDrawerByTime)
+				initPage()
+			},
+			cancel() {
+				handleCloseNode(myDrawerByTime)
+			},
+		})
+	}
+
+	/** 选择状态 | 类型 */
+	const handleShowChoosePicker = async (type : 'status' | 'type') => {
+		const _key = type + 'Arr'
+
+		details.pickerArr = details[_key]
+
+		let index = 0
+
+		for (let i = 0; i < details.pickerArr.length; i++) {
+			const _item = details.pickerArr[i]
+
+			if (_item.value !== details.form[type]) continue
+			index = i
+			break
+		}
+
+		details.value = [index]
+
+		console.log('details.value :>> ', details.value)
+		details.visible = false
+		await nextTick()
+		details.visible = true
+
+		myDrawer.value.setDetails({
+			showPopUp: true,
+			title: '选择' + (type === 'type' ? '类型' : '状态'),
+			cancelText: '清空',
+			success() {
+				const _item = details.pickerArr[details.value[0]]
+				details.form[type] = _item.value
+				details.form[type + 'Name'] = _item.label
+
+				console.log('details.form :>> ', details.form)
+
+				handleCloseNode(myDrawer)
+				initPage()
+			},
+			close() {
+				details.form[type] = ''
+				details.form[type + 'Name'] = ''
+				handleCloseNode(myDrawer)
+				initPage()
+			},
+			cancel() {
+				handleCloseNode(myDrawer)
+			},
+		})
+	}
+
+	/** 搜索 */
+	const handleSearch = () => {
+		// uni.navigateTo({
+		// 	url: '/pagesUser/pages/InstallTaskList/InstallTaskList'
+		// })
+		initPage()
+	}
 </script>
 
 <style lang="scss" scoped>
-@import url('@/utils/style/common.scss');
-
-.header_title {
-  background-color: var(--subjectColor);
-  color: #fff;
-  height: 100upx;
-}
-
-// tabbar
-.tabbar {
-  height: 100upx;
-  background-color: #fff;
-  position: relative;
-  $tabbarTime: 0.3s;
-  font-size: 1rem;
-  border-bottom: 2upx solid #eee;
-
-  .tabbar_item {
-    font-weight: bold;
-    color: #000;
-    transition: all $tabbarTime;
-
-    &.active {
-      color: var(--subjectColor);
-    }
-  }
-
-  .tabbar_active {
-    height: 8upx;
-    position: absolute;
-    width: 50%;
-    bottom: 0;
-    transition: all $tabbarTime;
-
-    &::after {
-      content: '';
-      display: block;
-      width: 4rem;
-      height: 100%;
-      background-color: var(--subjectColor);
-      border-radius: 4upx;
-    }
-  }
-}
-
-// 顶部搜索
-.search_container {
-  background: #fff;
-  padding: 20upx;
-
-  .input_container {
-    // padding: 20upx 100upx;
-    background: #f4f6f8;
-    border-radius: 50upx;
-    height: 80upx;
-
-    .first_icon {
-      width: 100upx;
-    }
-
-    input {
-    }
-
-    .search_text {
-      width: 150upx;
-      color: var(--subjectColor);
-    }
-  }
-}
-
-// 搜索行
-.search_row {
-  background: #f5f5f6;
-  // border-bottom: 2upx solid #eee;
-
-  & > view {
-    padding: 20upx 0;
-  }
-}
-
-.main {
-  font-size: 0.9rem;
-  position: relative;
-  // padding: 20upx;
-
-  // 任务列表
-  .list_container {
-    position: relative;
-    color: #000;
-    z-index: 10;
-    // padding: 20upx;
-
-    // 工人样式
-    .box {
-      border-radius: 10upx;
-      overflow: hidden;
-      margin: 20upx;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .title {
-        padding: 20upx 20upx;
-        background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
-        font-weight: 600;
-
-        .tip {
-          font-weight: normal;
-          color: #3ad8bc;
-        }
-      }
-
-      .info {
-        padding: 30upx 20upx;
-        background-color: #fff;
-        font-size: 0.9rem;
-      }
-
-      // 待签收
-      &.first {
-        .title {
-          background: linear-gradient(90deg, #fee8d0 0%, #fff 100%);
-
-          .tip {
-            color: var(--subjectColor);
-          }
-        }
-      }
-
-      // 服务中
-      &.second {
-        .title {
-          background: linear-gradient(90deg, #cde7fc 0%, #fff 100%);
-
-          .tip {
-            color: var(--primaryColor);
-          }
-        }
-      }
-
-      // 已指派
-      &.third {
-        .title {
-          background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
-
-          .tip {
-            color: #3ad8bc;
-          }
-        }
-      }
-    }
-  }
-}
-
-// picker样式
-.picker-view {
-  height: 40vh;
-
-  .item {
-    text-align: center;
-    line-height: 40px;
-  }
-}
-</style>
+	@import url('@/utils/style/common.scss');
+
+	.header_title {
+		background-color: var(--subjectColor);
+		color: #fff;
+		height: 100upx;
+	}
+
+	// tabbar
+	.tabbar {
+		height: 100upx;
+		background-color: #fff;
+		position: relative;
+		$tabbarTime: 0.3s;
+		font-size: 1rem;
+		border-bottom: 2upx solid #eee;
+
+		.tabbar_item {
+			font-weight: bold;
+			color: #000;
+			transition: all $tabbarTime;
+
+			&.active {
+				color: var(--subjectColor);
+			}
+		}
+
+		.tabbar_active {
+			height: 8upx;
+			position: absolute;
+			width: 50%;
+			bottom: 0;
+			transition: all $tabbarTime;
+
+			&::after {
+				content: '';
+				display: block;
+				width: 4rem;
+				height: 100%;
+				background-color: var(--subjectColor);
+				border-radius: 4upx;
+			}
+		}
+	}
+
+	// 顶部搜索
+	.search_container {
+		background: #fff;
+		padding: 20upx;
+
+		.input_container {
+			// padding: 20upx 100upx;
+			background: #f4f6f8;
+			border-radius: 50upx;
+			height: 80upx;
+
+			.first_icon {
+				width: 100upx;
+			}
+
+			input {}
+
+			.search_text {
+				width: 150upx;
+				color: var(--subjectColor);
+			}
+		}
+	}
+
+	// 搜索行
+	.search_row {
+		background: #f5f5f6;
+		// border-bottom: 2upx solid #eee;
+
+		&>view {
+			padding: 20upx 0;
+		}
+	}
+
+	.main {
+		font-size: 0.9rem;
+		position: relative;
+		// padding: 20upx;
+
+		// 任务列表
+		.list_container {
+			position: relative;
+			color: #000;
+			z-index: 10;
+			// padding: 20upx;
+
+			// 工人样式
+			.box {
+				border-radius: 10upx;
+				overflow: hidden;
+				margin: 20upx;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+
+				.title {
+					padding: 20upx 20upx;
+					background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
+					font-weight: 600;
+
+					.tip {
+						font-weight: normal;
+						color: #3ad8bc;
+					}
+				}
+
+				.info {
+					padding: 30upx 20upx;
+					background-color: #fff;
+					font-size: 0.9rem;
+				}
+
+				// 待签收
+				&.first {
+					.title {
+						background: linear-gradient(90deg, #fee8d0 0%, #fff 100%);
+
+						.tip {
+							color: var(--subjectColor);
+						}
+					}
+				}
+
+				// 服务中
+				&.second {
+					.title {
+						background: linear-gradient(90deg, #cde7fc 0%, #fff 100%);
+
+						.tip {
+							color: var(--primaryColor);
+						}
+					}
+				}
+
+				// 已指派
+				&.third {
+					.title {
+						background: linear-gradient(90deg, #d8f7f2 0%, #fff 100%);
+
+						.tip {
+							color: #3ad8bc;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// picker样式
+	.picker-view {
+		height: 40vh;
+
+		.item {
+			text-align: center;
+			line-height: 40px;
+		}
+	}
+</style>
\ No newline at end of file