guoyujia 5 months ago
parent
commit
3fac1f9ad4

+ 2 - 2
components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -500,8 +500,8 @@
 
 			.turnArea {
 				flex-wrap: wrap;
-				height: auto;
-				max-height: 200rpx;
+				height: 200px;
+				// max-height: 200rpx;
 				overflow: auto;
 			}
 

+ 16 - 15
pages/batchReporting/index.vue

@@ -402,11 +402,12 @@
 		let curProcessAfterList = [];
 		console.log("工序列表", item)
 		currentDaywork.value = item
-		if (item.isWasteRecycling == 1 || item.isAmend == 1) {
-			editStatus.value = true
-		} else {
-			editStatus.value = false
-		}
+		editStatus.value = false
+		// 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) {
@@ -661,10 +662,11 @@
 			var enprocessCode = encodeURIComponent(firstMatch.processCode);
 			var encodeCode = encodeURIComponent(currentDaywork.value.lotCode);
 			var enProcessAlias = encodeURIComponent(firstMatch.processAlias);
+			var enIsWasteRecycling = encodeURIComponent(currentDaywork.value.isWasteRecycling);
+			var enIsAmend = encodeURIComponent(currentDaywork.value.isAmend);
 			// 构建查询参数字符串
 			var queryParam =
-				`param1=${encodedId}&param2=${encodeCode}&param3=${enprocessCode}&param4=${enTechnologicalProcessId}&param5=${enProcessAlias}`;
-
+				`param1=${encodedId}&param2=${encodeCode}&param3=${enprocessCode}&param4=${enTechnologicalProcessId}&param5=${enProcessAlias}&param6=${enIsWasteRecycling}&param7=${enIsAmend}`;
 			// 使用模板字符串构建完整的URL
 			var navigateUrl = `/pages/drawingMenu/index?${queryParam}`;
 
@@ -729,23 +731,22 @@
 <style lang="scss">
 	$nav-height: 60rpx;
 
-	/* 遮罩层样式 */
 	.mask {
 		position: fixed;
-		/* 固定定位,覆盖整个屏幕 */
 		top: 0;
 		left: 0;
 		right: 0;
 		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.3);
-		/* 黑色背景,透明度30% */
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 5;
 		display: flex;
 		justify-content: center;
-		/* 水平居中 */
 		align-items: center;
-		/* 垂直居中 */
-		z-index: 1000;
-		/* 确保遮罩层在其他元素之上 */
+	}
+
+	.mask .loading-text {
+		color: #fff;
+		font-size: 36rpx;
 	}
 
 	.box-bg {

+ 2 - 2
pages/innerTurnover/index.vue

@@ -113,12 +113,12 @@
 			</view>
 		</scroll-view>
 		<!-- 抽屉 -->
-		<uni-drawer ref="showRight" mode="right" :mask-click="true">
+		<uni-drawer ref="showRight" mode="right" :mask-click="true" style="height: 100%;">
 			<view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
 			<view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
 				仅显示当前工序后面工艺
 			</view>
-			<scroll-view scroll-y="true" style="height: 82%;" @touchmove.stop>
+			<scroll-view scroll-y="true" style="height: 70%;" @touchmove.stop>
 				<view v-for="(item,index) in curProcessAfte" :key="index"
 					style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
 					<text>{{ index + 1 }}.{{item.processAlias}}</text>

+ 6 - 3
pages/inspectionDetails/index.vue

@@ -11,11 +11,14 @@
 				<input v-model="startTime" type="date" @input="timeSizer" />
 			</uni-section>
 		</view>
-		<view style="display: flex; flex-direction: row; align-items: center; margin-top: 10rpx;">
+		<view
+			style="display: flex; flex-direction: row; align-items: center; margin-top: 10rpx;background-color: #fff;">
 			<uni-section title="检查状态:" type="square" class="uni-row sta" style="flex: 1 1 100%;">
 				<uni-data-select v-model="quer.status" :localdata="statusData" :clear="true" placeholder="请选择检查状态"
-					@change="handleChangeStatus" style="background-color: #ffffff; flex: 1;"></uni-data-select>
+					@change="handleChangeStatus"
+					style="background-color: #ffffff; flex: 1;margin-right: 62px;"></uni-data-select>
 			</uni-section>
+			<view style="width: 18%;"></view>
 		</view>
 		<view class="daywork-item uni-column" v-for="(item, index) in inspecionList" :key="index"
 			@click="handleSelection(item)">
@@ -257,7 +260,7 @@
 </script>
 
 <style lang="scss">
-	.uni-section-content {
+	.uni-seluni-section-content {
 		flex: 1;
 	}
 

+ 176 - 142
pages/processInspectionReceive/form.vue

@@ -85,7 +85,7 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
@@ -95,26 +95,27 @@
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -144,15 +145,18 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
-		<textarea v-if="editable()"
+					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].remark }}</view>
-				
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'deliveryInspection')].remark }}
+					</view>
+
 				</view>
 			</view>
 		</view>
@@ -235,36 +239,37 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view class="label">超差范围</view>
-						<input v-if="editable()"  v-model="item.exceedLimits" maxlength="50" />
+						<input v-if="editable()" v-model="item.exceedLimits" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()" class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -294,14 +299,17 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
-		<textarea v-if="editable()"
+					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].remark }}</view>
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'patrolInspection')].remark }}
+					</view>
 				</view>
 			</view>
 
@@ -385,36 +393,37 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view class="label">超差范围</view>
-						<input v-if="editable()"  v-model="item.exceedLimits" maxlength="50" />
+						<input v-if="editable()" v-model="item.exceedLimits" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -444,14 +453,17 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
-		<textarea v-if="editable()"
+					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].remark }}</view>
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'instrumentRoomInspection')].remark }}
+					</view>
 				</view>
 			</view>
 
@@ -523,40 +535,40 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view class="label">超差范围</view>
-						<input v-if="editable()"  v-model="item.exceedLimits" maxlength="50" />
+						<input v-if="editable()" v-model="item.exceedLimits" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 						<view :class="!editable() ? 'label' : ''">废品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.rejectNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.rejectNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.rejectNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles" file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -586,14 +598,17 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
-		<textarea v-if="editable()"
+					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].remark }}</view>
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'outsourcedInspector')].remark }}
+					</view>
 				</view>
 			</view>
 
@@ -665,36 +680,37 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view class="label">超差范围</view>
-						<input v-if="editable()"  v-model="item.exceedLimits" maxlength="50" />
+						<input v-if="editable()" v-model="item.exceedLimits" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -724,14 +740,17 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
-		<textarea v-if="editable()"
+					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].remark }}</view>
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'factoryInspection')].remark }}
+					</view>
 				</view>
 			</view>
 
@@ -815,36 +834,37 @@
 					</view>
 					<view class="resu uni-row">
 						<view class="label">检查结果</view>
-						<input v-if="editable()"  v-model="item.checkResult" maxlength="50" />
+						<input v-if="editable()" v-model="item.checkResult" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.checkResult }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view class="label">超差范围</view>
-						<input v-if="editable()"  v-model="item.exceedLimits" maxlength="50" />
+						<input v-if="editable()" v-model="item.exceedLimits" maxlength="50" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.exceedLimits }}</view>
 					</view>
 					<view class="resu uni-row">
 						<view :class="!editable() ? 'label' : ''">检查量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.examiningNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.examiningNum" />
 						<view v-else class="number value" style="margin-left:16rpx;">{{ item.examiningNum }}</view>
 						<view :class="!editable() ? 'label' : ''">不良品量</view>
-						<input v-if="editable()"  class="number" type="number"
-							v-model="item.disqualificationNum" />
+						<input v-if="editable()" class="number" type="number" v-model="item.disqualificationNum" />
 						<view v-else class="value" style="margin-left:16rpx;">{{ item.disqualificationNum }}</view>
 					</view>
 				</view>
 			</view>
-<!-- 拍照上传部分 -->
-		<view class="title unfit-title uni-row">
-			<text>拍照上传</text>
-		</view>
-		<view class=" uni-row" style="padding: 24rpx;
+			<!-- 拍照上传部分 -->
+			<view class="title unfit-title uni-row">
+				<text>拍照上传</text>
+			</view>
+			<view class=" uni-row" style="padding: 24rpx;
 		margin: 0 16rpx;
 		background-color: #ffffff;
 		border-radius: 12rpx;">
-		<uni-file-picker v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files"  ></uni-file-picker>
-		</view>
+				<uni-file-picker
+					v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].processInspectionPictureList"
+					:readonly="true" return-type="array" :image-styles="imageStyles" file-mediatype="image"
+					class="my-files"></uni-file-picker>
+			</view>
 			<!-- 咨询部分 -->
 			<view class="title unfit-title uni-row">
 				<text>咨询</text>
@@ -874,14 +894,17 @@
 				</view>
 				<view class="result uni-row">
 					<view class="label" style="margin-top: 20rpx; margin-right: 10rpx;">放行状态</view>
-					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;" v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].status"
+					<uni-data-checkbox :disabled="true" style="margin-top: 20rpx;"
+						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].status"
 						:localdata="range"></uni-data-checkbox>
 				</view>
 				<view class="remark uni-row">
 					<view class="label">备注</view>
 					<textarea v-if="editable()"
 						v-model="inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].remark" />
-						<view v-else class="value">{{ inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].remark }}</view>
+					<view v-else class="value">
+						{{ inspectionList[inspectionList.findIndex(item =>item.type === 'firstArticleInspection')].remark }}
+					</view>
 				</view>
 			</view>
 
@@ -936,9 +959,9 @@
 		return false
 	}
 	const imageStyles = {
-				width:60,
-				height:60
-			}
+		width: 60,
+		height: 60
+	}
 
 	const consul = [{
 		value: 0,
@@ -1019,12 +1042,12 @@
 							};
 						}
 					});
-					res.data.forEach(item =>{
-						item.processInspectionPictureList.forEach(i=>{
+					res.data.forEach(item => {
+						item.processInspectionPictureList.forEach(i => {
 							i.url = webHost.value + i.url
 						})
 					})
-					console.log( res.data)
+					console.log(res.data)
 					inspectionList.value = res.data
 					isActived.value = processInspectionTypeList.value[0]
 					console.log(processInspectionTypeList.value)
@@ -1047,30 +1070,32 @@
 		// 		return consul[i].text
 		// 	}
 		// }
-		if(item.consultResultId == 0) {
+		if (item.consultResultId == 0) {
 			return '待确认'
-		}else{
+		} else {
 			return item.result
 		}
 	}
 	//确定领取
 	function handleConfirm() {
-		unbindInspectionCarrier({carrierCode:carrierCode.value}).then(res => {
-			if(res.code == 200) {
-			let pages = getCurrentPages();
-			let index = 0
-			for (let i = 0; i < pages.length; i++) {
-		
-				if (pages[i].$page.fullPath == "/pages/dashboard/index") {
-		
-					index = pages.length - i - 1;
+		unbindInspectionCarrier({
+			carrierCode: carrierCode.value
+		}).then(res => {
+			if (res.code == 200) {
+				let pages = getCurrentPages();
+				let index = 0
+				for (let i = 0; i < pages.length; i++) {
+
+					if (pages[i].$page.fullPath == "/pages/dashboard/index") {
+
+						index = pages.length - i - 1;
+					}
 				}
-			}
-			console.log("index", index);
-			uni.navigateBack({
-				delta: index
-			});
-			}else{
+				console.log("index", index);
+				uni.navigateBack({
+					delta: index
+				});
+			} else {
 				uni.showToast({
 					icon: 'none',
 					title: res.msg,
@@ -1146,27 +1171,34 @@
 	// 	}
 	// }
 	.tab-container {
-	  position: fixed;  /* 固定定位 */
-	  top: 44px;           /* 距离顶部0,即页面顶部 */
-	  left: 0;          /* 距离左侧0,即页面左侧 */
-	  right: 0;         /* 宽度充满整个页面宽度 */
-	  display: flex;
-	  flex-direction: row;
-	  height: 32px;
-	  background-color: #ffffff;
-	  z-index: 999;     /* 确保.tab-container在页面最上层 */
-	  padding: 8rpx 0;  /* 根据需要添加一些内边距 */
-	  box-sizing: border-box; /* 边框计算在宽度内 */
+		position: fixed;
+		/* 固定定位 */
+		top: 44px;
+		/* 距离顶部0,即页面顶部 */
+		left: 0;
+		/* 距离左侧0,即页面左侧 */
+		right: 0;
+		/* 宽度充满整个页面宽度 */
+		display: flex;
+		flex-direction: row;
+		height: 32px;
+		background-color: #ffffff;
+		z-index: 999;
+		/* 确保.tab-container在页面最上层 */
+		padding: 8rpx 0;
+		/* 根据需要添加一些内边距 */
+		box-sizing: border-box;
+		/* 边框计算在宽度内 */
 	}
-	
+
 	.tab-item {
-	  display: flex;
-	  flex-direction: row;
-	  flex: 1;
-	  font-size: 14px;
-	  color: #666;
-	  align-items: center;
-	  justify-content: center;
+		display: flex;
+		flex-direction: row;
+		flex: 1;
+		font-size: 14px;
+		color: #666;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.carrier-info {
@@ -1214,6 +1246,7 @@
 		margin-bottom: 24rpx;
 		justify-content: space-between;
 		align-items: center;
+		margin: 24rpx 16rpx;
 
 		text {
 			font-size: 28rpx;
@@ -1441,13 +1474,14 @@
 
 		}
 	}
+
 	.my-files {
 		display: flex;
 		justify-content: center;
-		
+
 		:deep(.uni-file-picker__container) {
-		flex-direction: row;
-			
+			flex-direction: row;
+
 		}
 	}
 </style>

+ 2 - 0
pages/reportHistory/index.vue

@@ -384,6 +384,8 @@
 
 <style lang="scss">
 	.time-controls {
+		align-items: center;
+
 		.title {
 			margin: 20% auto 40% auto;
 

+ 9 - 7
pages/sortBatchReporting/index.vue

@@ -310,10 +310,11 @@
 			var enprocessCode = encodeURIComponent(firstMatch.processCode);
 			var encodeCode = encodeURIComponent(currentDaywork.value.lotCode);
 			var enProcessAlias = encodeURIComponent(firstMatch.processAlias);
+			var enIsWasteRecycling = encodeURIComponent(currentDaywork.value.isWasteRecycling);
+			var enIsAmend = encodeURIComponent(currentDaywork.value.isAmend);
 			// 构建查询参数字符串
 			var queryParam =
-				`param1=${encodedId}&param2=${encodeCode}&param3=${enprocessCode}&param4=${enTechnologicalProcessId}&param5=${enProcessAlias}`;
-
+				`param1=${encodedId}&param2=${encodeCode}&param3=${enprocessCode}&param4=${enTechnologicalProcessId}&param5=${enProcessAlias}&param6=${enIsWasteRecycling}&param7=${enIsAmend}`;
 			// 使用模板字符串构建完整的URL
 			var navigateUrl = `/pages/drawingMenu/index?${queryParam}`;
 
@@ -447,11 +448,12 @@
 		let curProcessAfterList = [];
 		console.log(item)
 		currentDaywork.value = item
-		if (item.isWasteRecycling == 1 || item.isAmend == 1) {
-			editStatus.value = true
-		} else {
-			editStatus.value = false
-		}
+		editStatus.value = false
+		// 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++) {
 			console.log(item.nextProcess, "next")

+ 25 - 5
pages/sorting/options.vue

@@ -18,7 +18,14 @@
 				<view class="btn" @click="handleSearch()">搜索</view>
 			</view>
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 71%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style="position: absolute;
+    background-color: rgb(255, 255, 255);
+    height: 70%;
+    padding-bottom: 12px;
+    margin-top: 20px;
+    top: 90px;
+    left: 12px;
+    right: 12px;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="dataList&& dataList.length == 0" style="align-items: center;margin-top: 30px">暂无分选标准数据
 				</view>
@@ -181,10 +188,23 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// height: 120px;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+
+
+		position: fixed;
+		top: 43px;
+		/* height: 13%; */
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		left: 12px;
+		right: 12px;
+		height: 80px;
+		z-index: 5;
 	}
 
 	.tab-bars {

+ 29 - 9
pages/sorting/specialOptions.vue

@@ -20,10 +20,17 @@
 		</view>
 		<view v-if="categoryList && categoryList.length == 0" style="align-items: center;margin-top: 30px;">暂无分选标准
 		</view>
-		<view v-else class="uni-row"
-			style="background-color:#ffffff;height: 76%;padding-bottom: 12px;margin-bottom:65px;margin-top: 8px;">
-
-			<view style="width: 30%;height: 96%;overflow: auto;">
+		<!-- 		<view v-else class="uni-row" 
+			style="background-color:#ffffff;height: 76%;padding-bottom: 12px;margin-bottom:65px;margin-top: 8px;"> -->
+		<view v-else class="uni-row" style="position: absolute;
+    background-color: rgb(255, 255, 255);
+    height: 70%;
+    padding-bottom: 12px;
+    margin-top: 20px;
+    top: 90px;
+    left: 12px;
+    right: 12px;">
+			<view style="width: 30%;height: 95%;overflow: auto;">
 				<view v-for="(item, index) in categoryList" :key="index"
 					:class="{'category-item':true,'selected':isSelected(item)}" @click="cateClick(item)">
 					<view class="uni-row">
@@ -31,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-			<view style="width: 69%;height: 96%;overflow: auto;">
+			<view style="width: 69%;height: 95%;overflow: auto;">
 				<view v-if="dataList&& dataList.length == 0" style="align-items: center;margin-top: 30px">暂无分选标准数据
 				</view>
 				<view v-else v-for="(item, index) in dataList" :key="index"
@@ -186,10 +193,23 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// height: 120px;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+
+
+		position: fixed;
+		top: 43px;
+		/* height: 13%; */
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		left: 12px;
+		right: 12px;
+		height: 80px;
+		z-index: 5;
 	}
 
 	.tab-bars {