Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/components/parts/appliedPartsCell.vue

@@ -115,15 +115,17 @@
 				return this.titles[String(this.info.status)] || this.info.statusText
 			},
 			titles() {
-				 // 待签收 15  待发货 10  待审核 1 已取消 -1  已驳回 -2 已签收 20
+				 // 待签收 15；  待发货 10；  待审核 1； 已取消 -1；  已驳回 -2； 已签收 20；已完成 100；已核销 91
+				 // 已核销展示为已签收
 				return {
 					'1': '待审核',
 					'10': '待发货',
-					'15': '代签收',
+					'15': '待签收',
 					'20': '已签收',
 					'-2': '审核未通过',
 					'-1': '已取消',
-					'100': '已完成'
+					'100': '已完成',
+					'91': '已签收' // 已核销
 				}
 			},
 			titleColor() {
@@ -144,7 +146,9 @@
 					'15': '20',
 					'20': '',
 					'-2': '',
-					'-1': ''
+					'-1': '',
+					'100': '',
+					'91': ''
 				}
 			},
 			willStatus() {

src/components/parts/spareCell.vue

@@ -47,7 +47,6 @@
 			return {
 				value: 0, // 选数
 				check: false, // 选中
-				oldCount: 0 // 旧选数
 			}
 		},
 		computed: {
@@ -67,32 +66,24 @@
 			},
 		},
 		watch: {
-			showChecked(val) {
-				this.oldCount = 0
-			},
-			'item.quantity'(val) {
-				this.value = val
+			'item.quantity'(val) {
+				this.check = val > 0
+				this.value = val
 			},
 			'item.selected'(val) {
 				this.check = val
-				this.value = val ? this.item.stock : 0
+				this.value = val ? this.item.stock : 0
 			},
 		},
 		methods: {
 			handleChange(event) {
 				this.value = event.value ? this.item.stock : 0
-				this.oldCount = this.value
-				this.$emit('change', event.value)
+				this.$emit('change', event.value)
+				this.$emit('numChange', this.value)
 			},
-			numChange(event) {
-				if (event.value == 0 && this.oldCount > 0) {
-					this.check = false
-					this.$emit('change', this.check)
-				} else if (event.value > 0 && this.oldCount == 0) {
-					this.check = true
-					this.$emit('change', this.check)
-				}
-				this.oldCount = event.value
+			numChange(event) {
+				this.check = event.value > 0
+				this.$emit('change', this.check)
 				this.$emit('numChange', event.value)
 			},
 		}

src/pages.json

@@ -564,7 +564,7 @@
                     "path" : "returnParts",
                     "style" :                                                                                    
 					{
-						"navigationBarTitleText": "退返件",
+						"navigationBarTitleText": "退件",
 						"navigationStyle":"custom",
 						"enablePullDownRefresh": false
 					}

src/pages/mine/warehouse/express.vue

@@ -132,7 +132,7 @@
 			},
 			handleClick() {
 				uni.setClipboardData({
-					data: this.info.orderNumber,
+					data: this.info.express.number,
 					success: function() {
 						console.log('success');
 					}

src/pages/mine/warehouse/index.vue

@@ -88,10 +88,10 @@
 						'name': '待签收',
 						'status': 15
 					},
-					{
-						'name': '已签收',
-						'status': 20
-					}
+					// {
+					// 	'name': '已签收',
+					// 	'status': 20
+					// }
 				]
 			},
 			currentTab() {
@@ -135,6 +135,7 @@
 			let pages = getCurrentPages()
 			let page = pages[pages.length - 1]
 			if (page.needApplyList) {
+				page.needApplyList = null
 				this.currentIndex = 0
 				this.reloadPartsList()
 			}

src/pages/mine/warehouse/partsDetail.vue

@@ -107,14 +107,17 @@
 				return this.titles[String(this.info.status)] || this.info.statusText
 			},
 			titles() {
-				return {
+				// 待签收 15；  待发货 10；  待审核 1； 已取消 -1；  已驳回 -2； 已签收 20；已完成 100；已核销 91
+				 // 已核销展示为已签收
+				return {
 					'1': '待审核',
 					'10': '待发货',
-					'15': '代签收',
+					'15': '待签收',
 					'20': '已签收',
 					'-2': '审核未通过',
 					'-1': '已取消',
-					'100': '已完成'
+					'100': '已完成',
+					'91': '已签收' // 已核销
 				}
 			},
 			total() { // 合计
@@ -164,13 +167,14 @@
 					'20': '',
 					'-2': '',
 					'-1': '',
-					'100': ''
+					'100': '',
+					'91': ''
 				}
 			},
 			buttonOperateType() {
 				return this.operateTypes[this.info.status]
 			},
-			// 待签收 15 变 已签收 20； 10  待审核 1 变 已取消 -1
+			// 待签收 15 -> 已签收 20； 待审核 1 -> 已取消 -1
 			willStatuses() {
 				return {
 					'1': '-1',
@@ -179,7 +183,8 @@
 					'20': '',
 					'-2': '',
 					'-1': '',
-					'100': ''
+					'100': '',
+					'91': ''
 				}
 			},
 			willStatus() {
@@ -307,7 +312,8 @@
 
 				.image-view {
 					width: 72rpx;
-					height: 72rpx;
+					height: 72rpx;
+					flex-shrink: 0;
 				}
 
 				.right-view {

src/pages/mine/warehouse/searchParts.vue

@@ -74,10 +74,10 @@
 			},
 		},
 		onShow() {
-			// 从过程反馈回来，需要刷新数据
 			let pages = getCurrentPages()
 			let page = pages[pages.length - 1]
 			if (page.needApplyList) {
+				page.needApplyList = null
 				this.getPartsList()
 			}
 		},

src/pages/mine/warehouse/spare.vue

@@ -143,6 +143,7 @@
 						let list = res.data || []
 						for (var item of list) {
 							item.selected = false
+							item.stock = 12
 							this.partsList.push(item)
 						}
 
@@ -176,7 +177,8 @@
 			allSelect(value) {
 				console.log(value)
 				for (var item of this.partsList) {
-					item.selected = value
+					item.selected = value
+					item.quantity = value ? item.stock : 0
 				}
 			},
 			handleChange(value, index) {

src/pages/order/detail.vue

@@ -348,10 +348,12 @@
 			let pages = getCurrentPages()
 			let page = pages[pages.length - 1]
 			if (page.needFresh) {
+				page.needFresh = null
 				this.loadOrderDetail()
 				this.loadOrderRecord()
 			}
 			if (page.needApplyList) {
+				page.needApplyList = null
 				this.getApplyList()
 			}
 		},

src/pages/order/document.vue

@@ -139,6 +139,7 @@
 			let page = pages[pages.length - 1];
 			let selectedItem = page.selectedItem;
 			if (selectedItem) {
+				page.selectedItem = null
 				for (var item of this.labels[selectedItem.type]) {
 					if (item.id == selectedItem.id) {
 						this.handleClick(selectedItem.type, item)

src/pages/parts/returnParts.vue

 <template>
 	<view class="parts-wrap">
-		<w-navbar title="退返件"></w-navbar>
+		<w-navbar title="退件"></w-navbar>
 		<view class="form">
 			<view class="row">
 				<view class="label">返件方式</view>