1.新增完结工单有偿服务自定义费用

api/repair/repair.js

@@ -167,7 +167,9 @@ export function finishRepair(_that){
 				"resId": _that.goods.resId,
 			},
 			"resId": _that.goods.resId,
-			"useNumber": _that.useNumber
+			"useNumber": _that.useNumber,
+			"isCustom": _that.isCustom,
+			"customGoodsName": _that.customGoodsName,
 		}
 		console.log(_data);
 		let _beforeRepairPhotos = _that.beforeRepairPhotos;
@@ -191,8 +193,10 @@ export function finishRepair(_that){
 				msg = "商品数量不能为零";
 			}else if (_data.useNumber > _that.goods.stock){
 				msg = "库存不足";
-			}else if (!_data.conditions.resId){
+			}else if (!_data.isCustom && !_data.conditions.resId){
 				msg = "请选择商品";
+			}else if (_data.isCustom && !_data.customGoodsName){
+				msg = "请输入商品名";
 			// }else if (_data.price == '' || !_data.price || parseFloat(_data.price) < parseFloat(_data.outLowPrice) || parseFloat(_data.price) > parseFloat(_data.outHighPrice)){
 			}else if (_data.price == '' || !_data.price){
 				msg = "请输入有效金额";

pages/repairDispatchFinish/repairDispatchFinish.vue

@@ -34,6 +34,7 @@
 					<button class="cu-btn sm line-gray" @click="repairDetail(item)">详情</button>
 				</view>
 			</view>
+			<view class="load-more" @click="_loadMyModify()">加载更多</view>
 		</view>
 		<view v-else>
 			<no-data-page></no-data-page>
@@ -50,7 +51,8 @@
 				myOrders: [],
 				orders: [],
 				storeId: '',
-				noData: false
+				noData: false,
+				page: 1,
 			}
 		},
 		components: {
@@ -70,7 +72,7 @@
 				let _userInfo = this.java110Context.getUserInfo();
 				let storeId = _userInfo.storeId;
 				let _objData = {
-					page: 1,
+					page: this.page,
 					row: 15,
 					userId: _userInfo.userId,
 					communityId: _that.java110Context.getCurrentCommunity().communityId
@@ -82,7 +84,6 @@
 					method: "GET",
 					data: _objData, //动态数据
 					success: function(res) {
-						console.log("请求返回信息：", res);
 						let _json = res.data;
 						if (_json.code != 0) {
 							uni.showToast({
@@ -91,19 +92,24 @@
 							});
 							return;
 						}
+						if(_json.data.length <= 0){
+							uni.showToast({
+								title: '已全部加载'
+							})
+							return;
+						}
 						let _data = _json.data;
-						_that.myOrders = _data;
+						_data.forEach(function(item) {
+							let dateStr = item.appointmentTime;
+							let _date = new Date(dateStr.replace(/-/g, "/"));
+							item.appointmentTime = (_date.getMonth() + 1) + '-' + _date.getDate();
+						});
+						_that.myOrders = _that.myOrders.concat(_data);
+						_that.page ++;
 						if (_that.myOrders.length < 1) {
 							_that.noData = true;
 							return;
 						}
-						_that.myOrders.forEach(function(item) {
-							let dateStr = item.appointmentTime;
-							console.log(dateStr);
-							let _date = new Date(dateStr.replace(/-/g, "/"));
-							item.appointmentTime = (_date.getMonth() + 1) + '-' + _date.getDate();
-						});
-						// _that.orders = _data.ownerRepairs;
 					},
 					fail: function(e) {
 						wx.showToast({

pages/repairHandle/repairHandle.vue

@@ -42,12 +42,18 @@
 						</picker>
 					</view>
 					<view v-if="goodsIndex!=0">
+						<view class="cu-form-group margin-top" v-if="isCustom">
+							<view class="title">商品名</view>
+							<input v-model="customGoodsName" placeholder="请输入商品名"></input>
+						</view>
 						<view class="cu-form-group margin-top">
 							<view class="title">单价</view>
 							<input v-model="singlePrice" @input="goodsSinglePriceChange" :disabled="disabledPrice" placeholder="请输入单价"></input>
 						</view>
-						<view class="text-right text-grey" v-if="goods.outHighPrice == goods.outLowPrice">价格:{{goods.outLowPrice}}</view>
+						<view v-if="!isCustom">
-						<view class="text-right text-grey" v-else>价格范围{{goods.outLowPrice}}-{{goods.outHighPrice}}</view>
+							<view class="text-right text-grey" v-if="goods.outHighPrice == goods.outLowPrice">价格:{{goods.outLowPrice}}</view>
+							<view class="text-right text-grey" v-else>价格范围{{goods.outLowPrice}}-{{goods.outHighPrice}}</view>
+						</view>
 						<view class="cu-form-group margin-top">
 							<view class="title">数量</view>
 							<!-- <input v-model="useNumber" @input="goodsNumChange" placeholder="请输入数量"></input> -->
@@ -216,6 +222,8 @@
 					"outLowPrice": "",
 					"outHighPrice": "",
 				},
+				isCustom: false,
+				customGoodsName: '',
 			}
 		},
 		onLoad(options) {
@@ -298,6 +306,10 @@
 							return;
 						}
 						_that.goodsCloums = _that.goodsCloums.concat(_data);
+						// 如果是“其他类” 追加 “自定义” 选项
+						if(_that.goodsTypeCloums[_that.goodsTypeIndex].statusCd == '1003'){
+							_that.goodsCloums = _that.goodsCloums.concat([{resName: '自定义'}]);
+						}
 					});
 			},
 			
@@ -339,6 +351,14 @@
 					this.goods = ''
 					return;
 				}
+				// 自定义商品
+				if(this.goodsCloums[this.goodsIndex].resName == "自定义"){
+					this.goods = ''
+					this.isCustom = true;
+					return;
+				}else{
+					this.isCustom = false;
+				}
 				let selected = this.goodsCloums[this.goodsIndex] //获取选中的数组
 				this.goods = selected
 				if(selected.outLowPrice == selected.outHighPrice){