Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/dashboard/index.vue

pages/auxiliaryDaywork/index.vue

@@ -274,10 +274,10 @@
 			daywork: item
 		}
 		uni.navigateTo({
-			url: "/pages/changeInspectionBox/index",
+			url: "/pages/changeBox/index",
 			success: function(res) {
 				// 通过eventChannel向被打开页面传送数据
-				res.eventChannel.emit('outsourceFromOpenerPage', {
+				res.eventChannel.emit('acceptDataFromOpenerPage', {
 					data: openItem
 				})
 			}

pages/dashboard/index.vue

@@ -42,10 +42,13 @@
 		<view class="business-btn uni-row" v-if="showSizing" @click="handleToSorting">
 			<text class="label">分选报工</text>
 		</view>
+		<view class="business-btn uni-row" v-if="showAuxiliary" @click="handleToAuxiliary">
+			<text class="label">辅助工序报工</text>
+		</view>
 		<view class="business-btn uni-row" @click="handleToGetLotInfo">
 			<text class="label">扫码查询批次信息</text>
 		</view>
-<!-- 		<view class="business-btn uni-row" v-if="showInspector" @click="handleToProcessInspection">
+		<!-- 		<view class="business-btn uni-row" v-if="showInspector" @click="handleToProcessInspection">
 			<text class="label">序检</text>
 		</view> -->
 		<view class="business-btn uni-row"  @click="handleToInspectionReceive">
@@ -170,15 +173,15 @@
 			showOther.value = true;
 		}
 		//盘点状态
-		if(store.userInfo.takeStock) {
+		if (store.userInfo.takeStock) {
 			showTakeStock.value = true
-		}else{
+		} else {
 			showTakeStock.value = false
 		}
 		//巡检
-		if(store.userInfo.roles.some(item =>item.roleKey == 'patrolInspection')) {
+		if (store.userInfo.roles.some(item => item.roleKey == 'patrolInspection')) {
 			showOnSiteInspector.value = true
-		}else{
+		} else {
 			showOnSiteInspector.value = false
 		}
 		//交检
@@ -217,6 +220,7 @@
 			showOutsourcedInspector.value = true
 			// showOther.value = true;
 		}
+		showAuxiliary.value = true
 		init();
 	})
 
@@ -436,7 +440,7 @@
 			
 			// 测试时用
 		checkCarrier({
-			carrierCode: "300088",
+			carrierCode: "300086",
 		}).then(response => {
 			if (response.code == 200) {
 				uni.navigateTo({
@@ -444,7 +448,7 @@
 							success: (res) => {
 								// 通过eventChannel向被打开页面传送数据
 								res.eventChannel.emit("inspecionCarrierCode", {
-									carrierCode: "300088"
+									carrierCode: "300086"
 								})
 							}
 						})
@@ -502,7 +506,7 @@
 			})
 		}
 	}
-   //交检
+	//交检
 	function handleToDeliveryInspection() {
 		if (curSelectedDeptId.value) {
 			uni.navigateTo({
@@ -612,12 +616,28 @@
 	}
 	//查询当前工段当前操作者是否能看见内部周转按钮
 	function handleSelectInnerTurnover() {
-		listInnerTurnover({deptId:store.curDeptDetails.deptId,userId:store.userInfo.userId}).then(res =>{
-			if(res.code == 200){
-				showInnerTurnover.value = res.rows.length>0?true:false
+		listInnerTurnover({
+			deptId: store.curDeptDetails.deptId,
+			userId: store.userInfo.userId
+		}).then(res => {
+			if (res.code == 200) {
+				showInnerTurnover.value = res.rows.length > 0 ? true : false
 			}
 		})
 	}
+
+	function handleToAuxiliary() {
+		if (curSelectedDeptId.value) {
+			uni.navigateTo({
+				url: '/pages/auxiliaryDaywork/index'
+			})
+		} else {
+			uni.showToast({
+				icon: "none",
+				title: "请选择工段"
+			})
+		}
+	}
 </script>
 
 <style lang="scss">