bug修复

.hbuilderx/launch.json

@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]

apis/apis.js

@@ -499,7 +499,7 @@ const fix = {
 	},
 	async fixCrew (data = {} , header = {}){
 		return await Http.get(
-			HttpConfig.basePath,
+			HttpConfig.systemPath,
 			HttpConfig.serviceUrl.fix.fixCrew,
 			data,
 			header

pages/codeOutStore/codeOutStore.vue

@@ -2,9 +2,13 @@
 	<view>
 		<view class="form-area">
 			<view class="upper-ipt">
-				<!-- <uni-easyinput style="margin-bottom: 15rpx;" v-model="carCode" placeholder="请输入车牌号"></uni-easyinput> -->
 				<uni-easyinput suffixIcon="search" v-model="codeVal" placeholder="请输入编码" @iconClick="searchCode"></uni-easyinput>
 			</view>
+			<view class="car-info" v-show="infoList.length != 0">
+				<h4>是否有车牌号</h4>
+				<u-switch v-model="isCarCode" size="22" @change="() => isCarCode ? carCode = '' : carCode = '无车牌'"></u-switch>
+			</view>
+			<uni-easyinput v-show="infoList.length != 0" style="margin-bottom: 15rpx;" v-model="carCode" placeholder="请输入车牌号" :disabled="!isCarCode" @blur="checkCarCode"></uni-easyinput>
 			<view 
 				class="info-area"
 				v-for="(item, index) in infoList"
@@ -51,6 +55,7 @@
 	export default {
 		data() {
 			return {
+				isCarCode: true,
 				carCode: '',
 				codeVal: '',
 				typeId: '',
@@ -63,6 +68,19 @@
 			}
 		},
 		methods: {
+			// 检查车牌号
+			checkCarCode () {
+				if (this.carCode) {
+					const reg = /^[\u4E00-\u9FA5]{1}[A-Z]{1}[A-Z0-9]{5,6}$/
+					if (!reg.test(this.carCode)) {
+						uni.showToast({
+							icon: 'none',
+							title: '车牌号格式不正确！'
+						})
+						this.carCode = this.$set(this, 'carCode', '')
+					}
+				}
+			},
 			searchCode () {
 				let that = this
 				that.infoList = []
@@ -93,6 +111,13 @@
 						title: '机具类型不匹配！'
 					})
 				} else {
+					if (!that.carCode && that.isCarCode) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入车牌号！'
+						})
+						return
+					}
 					that.subList = {
 						parentId: that.parentId,
 						typeId: that.typeId,
@@ -100,7 +125,7 @@
 						taskId: that.taskId,
 						maId: that.infoList[0].maId,
 						outNum: 1,
-						// carCode: that.carCode,
+						carCode: that.carCode,
 						companyId: uni.getStorageSync('userInfo').sysUser.companyId
 					}
 					console.log(that.subList);
@@ -140,6 +165,20 @@
 </script>
 
 <style lang="scss">
+.car-info{
+	margin-bottom: 15rpx;
+	display: flex;
+	align-items: center;
+	h4{
+		font-weight: normal;
+		color: #989898;
+		font-size: 14px;
+		width: 35%;
+	}
+	span{
+		font-size: 14px;
+	}
+}
 	.form-area{
 		width: 90%;
 		margin: 40rpx auto;

pages/exitMaterialSelect/exitMaterialSelect.vue

@@ -199,6 +199,7 @@
                                     that.submitList.companyId =
                                         that.submitList.backApplyDetails[0].companyId;
                                     that.submitList.taskId = that.taskId;
+                                    this.submitList.agreementId = this.agreementId
                                     console.log(that.submitList);
                                     that.$api.exitMaterial
                                         .subExitMaterial(that.submitList)

pages/innerFix/innerFix.vue

@@ -253,12 +253,12 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
 		onShow() {
 			let that = this
 			// 获取维修人员
-			that.$api.fix.fixCrew().then(res => {
+			that.$api.fix.fixCrew({ roleIds: [133, 134] }).then(res => {
-				console.log(res);
+				console.log('🚀 ~ 维修人员.fixCrew ~ res:', res)
 				if (res.data.code == 200) {
 					that.repairerRange = res.data.data.map((item) => {
 						return {
-							text: item['nickName'],
+							text: item['userName'],
 							value: item['userId']
 						}
 					})

pages/preCrashExam/preCrashExam.vue

@@ -150,6 +150,8 @@
 		},
 		methods: {
 			searchKeyword () {
+				this.pageNum = 1
+				this.pageSize = 10
 				this.fetchPreCrashList(this.preIpt)
 			},
 			fetchPreCrashList (keyword) {
@@ -161,8 +163,12 @@
 				}).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {
-						that.pageTotal = res.data.total
+						if (keyword) {
-						that.preCrashList = [...that.preCrashList, ...res.data.rows]
+							that.preCrashList = res.data.rows
+						} else {
+							that.pageTotal = res.data.total
+							that.preCrashList = [...that.preCrashList, ...res.data.rows]
+						}
 					}
 				}).catch(err => {
 					console.log(err);
@@ -197,7 +203,7 @@
 		},
 		onReachBottom() {
 			if (this.preCrashList.length >= this.pageTotal) return;
-			this.pageNum++
+			this.pageSize += 10
 			this.fetchPreCrashList(this.preIpt)
 		}
 	}

pages/serviceCenterExamDetail/serviceCenterExamDetail.vue

@@ -77,7 +77,9 @@
 			getListDetail (taskId) {
 				let that = this
 				that.$api.serviceCenterExam.fetchCenterDetail({
-					taskId
+					taskId,
+					pageNum: 1,
+					pageSize: 99999
 				}).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {