第一轮测试bug修复

src/components/createCom/XhParts.vue

@@ -43,6 +43,14 @@
 			orderId: {
 				type: String,
 				default: ''
+			},
+			categoryId: {
+				type: String,
+				default: ''
+			},
+			brandId: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -91,7 +99,7 @@
       },
       toParts() {
         uni.navigateTo({
-          url: `/pages/order/parts?workOrderId=${this.orderId}`
+          url: `/pages/order/parts?workOrderId=${this.orderId}&brandId=${this.brandId}&categoryId=${this.categoryId}`
         })
       }
 		}

src/pages/index/order.vue

@@ -244,6 +244,7 @@
 						+ "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[Object.keys(item.auditResults).length - 1]:'')
 						+ "&maintainStep=" + item.maintainStep
 						+ '&orderStatus=' + item.orderStatus
+						+ '&brandId=' + item.lianbaoBrandId
 				})
 			},
 			handleClick(item, type, showCountTime) { // type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动

src/pages/mine/warehouse/records.vue

@@ -34,7 +34,7 @@
 				</u-col>
 				<u-col span="3">
 					<view class="row-txt u-text-right time-txt">
-					{{ (item.updateTime || item.createTime) | datefmt('YYYY.MM.DD HH:mm:ss')}}
+					{{ (item.createTime || item.updateTime) | datefmt('YYYY.MM.DD HH:mm:ss')}}
 					</view>
 				</u-col>
 			</u-row>
@@ -55,6 +55,7 @@
 				search: {
 					pageNumber: 0,
 					pageSize: 50,
+					accessType: 1,
 				},
 			};
 		},

src/pages/order/complete.vue

@@ -72,7 +72,7 @@
                                                 </xh-service-more>
                                                 <xh-label v-else-if="item.formType==='label'" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'>
                                                 </xh-label>
-                                                <xh-parts ref="fileChildParts" v-else-if="item.formType==='parts'" :order-id="orderId" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :disabled="orderStatus === '88' || orderStatus === '86'" @value-change="fieldValueChange">
+                                                <xh-parts ref="fileChildParts" v-else-if="item.formType==='parts'" :categoryId="categoryId" :brandId="brandId" :order-id="orderId" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :disabled="orderStatus === '88' || orderStatus === '86'" @value-change="fieldValueChange">
                                                 </xh-parts>
                                             </template>
                                         </u-form-item>
@@ -215,6 +215,7 @@
                 hiddenTitle: ['location', 'form', 'label', 'parts'],
                 orderId:0,
 				categoryId:0,
+				brandId: 0,
 				orderServiceType:'',
 				inGuaranteePeriod:'',
 				partnerCompanyId:'',
@@ -291,6 +292,7 @@
                 this.maintainStep = option.maintainStep
                 this.orderId = option.orderId
                 this.categoryId = option.categoryId
+				this.brandId = option.brandId
                 this.orderServiceType = decodeURIComponent(option.orderServiceType)
                 this.inGuaranteePeriod = option.inGuaranteePeriod
                 this.partnerCompanyId = option.partnerCompanyId

src/pages/order/detail.vue

@@ -805,6 +805,7 @@
 						+ '&partnerCompanyName=' + this.order.partnerCompanyName
 						+ '&maintainStep=' + this.order.maintainStep
 						+ '&orderStatus=' + this.order.orderStatus
+						+ '&brandId=' + this.order.lianbaoBrandId
 				})
 			},
 			rejectOrder() { // 拒单

src/pages/order/parts.vue

@@ -65,12 +65,14 @@
       }
     },
     onLoad(e) {
-      this.workOrderId = parseInt(e.workOrderId)
+      this.workOrderId = parseInt(e.workOrderId)
+	  this.categoryId = parseInt(e.categoryId)
+	  this.brandId = parseInt(e.brandId)
       this.getReserve()
     },
     methods: {
       getReserve() {
-        this.$u.api.getMyReserve().then(res => {
+        this.$u.api.getMyReserve({'categoryId': this.categoryId, 'brandId': this.brandId}).then(res => {
           if (res.code === 200) {
             const data = res.data || []
             this.lists = data.map(v => {

src/pages/parts/application.vue

@@ -17,12 +17,16 @@
 								<view slot="error" style="font-size: 24rpx;">加载失败</view>
 							</u-image>
 						</view>
-						<view class="message">当前还未选择配件，请点击添加，添加后在'我的->备件订单'查看</view>
+						<view class="message">当前还未选择备件，请点击添加，添加后在'我的->备件订单'查看</view>
 						<button class="add-button" plain="true" @click="$u.throttle(addParts, 500)">去添加</button>
 					</view>
 					<view v-else class="list">
 						<view v-for="(row, index) in parts" :key="index">
-							<select-parts :info="row"></select-parts>
+							<select-parts
+							  :info="row"
+							  :show-checked="false"
+							  @change="numChange($event, index)"
+							></select-parts>
 						</view>
 					</view>
 					<u-gap height="40"></u-gap>
@@ -78,6 +82,11 @@ export default {
 				fontWeight: 600,
 			}
 		},
+		selectedParts() {
+			return this.parts.filter((item) => {
+				return item.quantity > 0
+			})
+		}
 	},
 	onLoad(e) {
 		getApp().trackPage('备件申请页')
@@ -149,11 +158,29 @@ export default {
 				params: data,
 			})
 		},
+		numChange(val, index) {
+		  this.$set(this.parts[index], 'quantity', val)
+		},
 		updateParts(parts) {
-			if(this.$u.test.isEmpty(parts)) {
-				this.parts = []
-			} else {
-				this.parts = parts
+			// if(this.$u.test.isEmpty(parts)) {
+			// 	this.parts = []
+			// } else {
+			// 	this.parts = parts
+			// }
+			if(!this.$u.test.isEmpty(parts)) {
+				for(var val of parts) {
+					var has = false
+					for(var item of this.parts) {
+						if (item.part_id == val.part_id) {
+							has = true
+							item.quantity += val.quantity
+							break
+						}
+					}
+					if (!has) {
+						this.parts.push(val)
+					}
+				}
 			}
 		},
 		validateForm() {
@@ -197,7 +224,7 @@ export default {
 			let params = {
 				applyType: '1',
 				remark: this.remark,
-				parts: JSON.stringify(this.parts),
+				parts: JSON.stringify(this.selectedParts),
 				name: address.name,
 				phoneNumber: address.mobile,
 				province: address.region[0],