改bug

api/salesServiceManagement/workOrder/index.js

@@ -162,3 +162,16 @@ export async function recycleDetails(id) {
 	}
 	return Promise.reject(new Error(res.message));
 }
+
+// 检查是否执行人
+export async function checkByWorkId(id) {
+	const res = await get(Vue.prototype.apiUrl + `/eom/afterSalesWorkOrder/checkByWorkId/${id}`);
+	console.log(res);
+	if (res.code == 0) {
+		return res.data;
+	}
+	return Promise.reject(new Error(res.message));
+}
+
+
+

pages/saleManage/components/selectProject.vue

@@ -73,8 +73,8 @@
 		data() {
 			return {
 				page: 1,
-				size: 20,
-				isEnd: true,
+				size: 10,
+				isEnd: false,
 				searchVal: '',
 				pickTabIndex: 1,
 				popupShow: false, //右侧搜索窗
@@ -95,6 +95,11 @@
 			},
 
 		},
+		onShow() {
+			this.isEnd = false
+			this.page = 1
+			this.getList()
+		},
 		onLoad({
 			isAll
 		}) {
@@ -104,21 +109,40 @@
 		onShow() {},
 		methods: {
 			scrolltolower() {
+				this.getList()
+			},
+			//列表数据
+			getList() {
 				if (this.isEnd) {
 					return
 				}
-				// 显示加载图标
+
 				uni.showLoading({
-					title: '数据加载中'
+					title: '加载中'
 				})
-				//获取更多数据
-				this.page++
-				this.getList()
-			},
-			//列表数据
-			async getList() {
-				this.isEnd = false
-				this._getClassifyList()
+
+				let params = {
+					pageNum: this.page,
+					size: this.size,
+					name: this.searchVal
+				}
+
+				projectsPageAPI(params).then(res => {
+					if (this.page === 1) {
+						this.listData = res.list
+					} else {
+						this.listData.push(...res.list)
+					}
+					this.page += 1
+					this.isEnd = this.listData.length >= res.count
+				}).then(() => {
+					uni.hideLoading()
+				})
+
+
+
+				// this.isEnd = false
+				// this._getClassifyList()
 			},
 			async _getClassifyList() {
 				uni.showLoading({
@@ -126,7 +150,7 @@
 				})
 				const params = {
 					pageNum: 1,
-					size: this.page,
+					size: this.size,
 					name: this.searchVal,
 				}
 
@@ -152,6 +176,7 @@
 				});
 			},
 			doSearch() {
+				this.isEnd = false
 				this.page = 1
 				this.getList()
 			},

pages/salesServiceManagement/workOrder/components/planInfo.vue

@@ -23,13 +23,13 @@
 		</u-cell>
 		<u-cell title="预计售后时长" arrow-direction="down">
 			<view slot="value" style="display: flex;align-items: center;width: 100%;">
-				<u--input style="flex:1" readonly border="surround" v-model="form.duration">
-					<template #suffix>
+				<u-input style="flex:1" readonly border="surround" v-model="form.duration">
+					<template slot='suffix'>
 						<uni-data-picker class="time_select" readonly v-model="form.durationUnit" slot="value"
 							placeholder="请选择" :localdata="durationList">
 						</uni-data-picker>
 					</template>
-				</u--input>
+				</u-input>
 			</view>
 		</u-cell>
 		<u-cell title="部门" arrow-direction="down">
@@ -44,11 +44,11 @@
 				</u--input>
 			</view>
 		</u-cell>
-		<u-cell title="紧急程度" arrow-direction="down"> 
-		<view slot="value" style="display: flex;align-items: center;width: 100%;">
-			<u--input style="flex:1" readonly placeholder="请选择" border="surround" v-model="form.urgent">
-			</u--input>
-		</view>
+		<u-cell title="紧急程度" arrow-direction="down">
+			<view slot="value" style="display: flex;align-items: center;width: 100%;">
+				<u--input style="flex:1" readonly placeholder="请选择" border="surround" v-model="form.urgent">
+				</u--input>
+			</view>
 			<!-- 			<uni-data-picker  v-model="form.urgent" slot="value" placeholder="请选择"
 					:localdata="urgentList" @change="urgentOnchange">
 				</uni-data-picker> -->
@@ -70,18 +70,18 @@
 				default: () => {}
 			}
 		},
-		watch:{
-			planForm:{
-				handler(val){
+		watch: {
+			planForm: {
+				handler(val) {
 					this.form = val;
 				},
-				immediate:true,
-				deep:true,
+				immediate: true,
+				deep: true,
 			}
 		},
 		data() {
 			return {
-				form:{},
+				form: {},
 				durationList: [{
 						value: '1',
 						text: '分钟'

pages/salesServiceManagement/workOrder/index.vue

@@ -54,7 +54,8 @@
 
 	import {
 		getSalesWorkOrder,
-		receiveSalesWorkOrder
+		receiveSalesWorkOrder,
+		checkByWorkId
 	} from '@/api/salesServiceManagement/workOrder/index.js'
 	import myCard from '@/pages/saleManage/components/myCard.vue'
 	import CheckAndAccept from './components/forWork/checkAndAccept.vue'
@@ -475,10 +476,13 @@
 				this.getList();
 			},
 			// 申请配件
-			addSpareItems(id) {
-				uni.navigateTo({
-					url: `/pages/salesServiceManagement/workOrder/components/accessory?id=${id}`
-				})
+			async addSpareItems(id) {
+				const result = await this.checkId(id)
+				if (result) {
+					uni.navigateTo({
+						url: `/pages/salesServiceManagement/workOrder/components/accessory?id=${id}`
+					})
+				}
 			},
 			// 验收
 			checkAndAccept(item) {
@@ -532,6 +536,15 @@
 				this.searchForm = data
 				this.doSearch()
 			},
+			async checkId(id) {
+				try {
+					await checkByWorkId(id)
+					return true
+				} catch (error) {
+					console.log(error);
+					return false
+				}
+			}
 
 		}
 	}

utils/request.js

@@ -66,6 +66,7 @@ const http = ({
 						title: res.data.message,
 						icon: "none",
 					});
+					reject(res.data)
 				} else {
 					resolve(res.data);
 				}