Merge remote-tracking branch 'origin/master'

pages/dashboard/index.vue

@@ -35,8 +35,7 @@
 			<view class="business-btn uni-row" v-if="showTakeStock" @click="handleToTakeStock">
 				<text class="label">盘点</text>
 			</view>
-			<view class="business-btn uni-row" v-if="showOther && !showSizing && !showOutsource"
-				@click="handleToProductionPlan">
+			<view class="business-btn uni-row" v-if="dayworkall('showOther')" @click="handleToProductionPlan">
 				<text class="label">报工</text>
 			</view>
 			<view class="business-btn uni-row" v-if="showOther && !showSizing && !showOutsource && showAssistDaywork"
@@ -46,7 +45,7 @@
 			<view class="business-btn uni-row" v-if="showInnerTurnover && !showOutsource" @click="handleInnerTurnover">
 				<text class="label">内部周转</text>
 			</view>
-			<view class="business-btn uni-row" v-if="showSizing && !showOutsource" @click="handleToSorting">
+			<view class="business-btn uni-row" v-if="dayworkall('showSizing')" @click="handleToSorting">
 				<text class="label">分选报工</text>
 			</view>
 			<view class="business-btn uni-row" v-if="showOutsource && !showSortOutsource"
@@ -298,6 +297,25 @@
 			}
 		})
 	}
+
+
+	//根据权限判断是否全部展示分选报工和普通报工
+	function dayworkall(tape) {
+		console.log("tape", tape);
+		console.log("store.userInfo.permissions", store.userInfo.permissions);
+		//判断是否有权限，如果没有权限则判断按钮类型
+		if (store.userInfo.permissions.some(item => item === 'business:dawworkAll:list') || store.userInfo
+			.permissions.some(item => item === "*:*:*")) {
+			// 有权限则全部展示
+			return true
+		} else if (tape === "showOther") { //普通报工按钮判断
+			return (showOther.value && !showSizing.value && !showOutsource.value)
+		} else if (tape === "showSizing") { //分选报工按钮判断
+			return (showSizing.value && !showOutsource.value)
+		}
+
+	}
+
 	// 获取人员工段
 	function getUserDepts(userId, tenantId) {
 		userDeptsByTenantId.value = []

pages/fastProductionPlan/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<view class="mask" v-if="isLoading"></view>
 	<view class="uni-column" style="height: 100%;padding: 8px;position: fixed;left: 0;right: 0;">
 		<view v-if="allData.length>0" style="margin-bottom: 20rpx;">
 			<view>
@@ -504,6 +505,7 @@
 					duration: 2000
 				})
 			} else {
+				isLoading.value = true; // 显示遮罩层
 				loading.value = true
 				uni.showLoading({
 					title: '加载中'
@@ -513,6 +515,8 @@
 					item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 				})
 				finishQuick(selection.value).then(res => {
+					isLoading.value = false; // 显示遮罩层
+					uni.hideLoading();
 					// console.log(res)
 					if (res.code === 200) {
 						init()
@@ -711,4 +715,22 @@
 		background-color: #c0c4fc;
 		/* 选中之后样式 */
 	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 20;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask .loading-text {
+		color: #fff;
+		font-size: 36rpx;
+	}
 </style>