Selaa lähdekoodia

0625电子图纸预览bug修改

ezhizao\ezhizao_zx 1 vuosi sitten
vanhempi
commit
f6dd5153ab

+ 7 - 1
components/dialog-lotReporting/dialog-lotReporting.vue

@@ -82,7 +82,7 @@
 						<text>{{ index + 1 }}.{{item.processAlias}}</text>
 					</view>
 				</scroll-view>
-				<view><button  class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary" @click="handleOpenDrawing">查看本工序图纸</button></view>
+				<view><button v-if="!editStatus" class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary" @click="handleOpenDrawing">查看本工序图纸</button></view>
 			</uni-drawer>
 		</view>
 		<view class="add-btn-container uni-row">
@@ -125,6 +125,7 @@
 	const curProcessAfte = ref([])
 	const deptList = ref([])
 	const item = ref({})
+	const editStatus = ref(false)
 	const showRight = ref(null) // 抽屉
 	function open(data) {
 		// if (data === 'test') {
@@ -165,6 +166,11 @@
 
 	function handleClickProcessList(item) {
 		console.log(item,7979)
+		if(item.isWasteRecycling ==1 || item.isAmend ==1){
+			editStatus.value = true
+		}else{
+			editStatus.value = false
+		}
 		var filteredProcess = item.processSequence.filter(i => i.processStepNumber == item.process.processStepNumber);
 		currentTechnologicalProcessDetailId.value = filteredProcess[0].technologicalProcessDetailId
 		console.log(currentTechnologicalProcessDetailId.value)

+ 7 - 2
pages/batchReporting/index.vue

@@ -120,7 +120,7 @@
 				</view>
 				
 			</scroll-view>
-			<view><button  class="view-end-btn" type="primary"  @click="handleOpenDrawing">查看本工序图纸</button></view>
+			<view><button v-if="!editStatus" class="view-end-btn" type="primary"  @click="handleOpenDrawing">查看本工序图纸</button></view>
 		</uni-drawer>
 		<!-- <view v-if="bottomStatus" class="bottom uni-row">
 			<button class="start-batch-btn" type="primary" @click="handleStartNewBatch">开始新批次</button>
@@ -200,7 +200,7 @@
 	const notPreProcess = ref(true)
 	const curProcessAfte = ref([])
 	const showRight = ref(null) // 抽屉
-
+	const editStatus = ref(false)
 
 
 	onLoad(() => {
@@ -343,6 +343,11 @@
 		let curProcessAfterList = [];
 		console.log("工序列表", item)
 		currentDaywork.value = item
+		if(item.isWasteRecycling ==1 || item.isAmend ==1){
+			editStatus.value = true
+		}else{
+			editStatus.value = false
+		}
 		let nextIndex = 0;
 		for (let i = 0; i < item.processSequence.length; i++) {
 			if (item.nextProcess.id == item.processSequence[i].id) {

+ 7 - 2
pages/sortBatchReporting/index.vue

@@ -119,7 +119,7 @@
 					<text>{{ index + 1 }}.{{item.processAlias}}</text>
 				</view>
 			</scroll-view>
-			<view><button  class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary" @click="handleOpenDrawing">查看本工序图纸</button></view>
+			<view><button v-if="!editStatus" class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary" @click="handleOpenDrawing">查看本工序图纸</button></view>
 		</uni-drawer>
 		<!-- <view v-if="bottomStatus" class="bottom uni-row">
 			<button class="start-batch-btn" type="primary" @click="handleStartNewBatch">开始新批次</button>
@@ -196,7 +196,7 @@
 	const notPreProcess = ref(true)
 	const curProcessAfte = ref([])
 	const showRight = ref(null) // 抽屉
-
+	const editStatus = ref(false)
 	onLoad(() => {
 		curPlan.value = store.planDetails;
 		normalStatus.value = true;
@@ -408,6 +408,11 @@
 		let curProcessAfterList = [];
 		console.log(item)
 		currentDaywork.value = item
+		if(item.isWasteRecycling ==1 || item.isAmend ==1){
+			editStatus.value = true
+		}else{
+			editStatus.value = false
+		}
 		let nextIndex = 0;
 		for (let i = 0; i < item.processSequence.length; i++) {
 			if (item.nextProcess.id == item.processSequence[i].id) {