提交

api/base/path.js

@@ -14,16 +14,16 @@ export const path = reactive({
 
 	// 内网
 	// innerURL: 'http://192.168.31.151:8099',
-	innerURL: 'http://120.46.159.163:7004',
-	innerUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
-	innerPdfAppURL: 'http://120.46.159.163:401/ezhizao-dms-sys',
-	innerFurnaceNoURL: 'http://120.46.159.163:7002',
+	innerURL: 'http://192.168.10.40:7004',
+	innerUpdateAppURL: 'http://192.168.10.40/ezhizao-dms-production',
+	innerPdfAppURL: 'http://192.168.10.40/ezhizao-dms-sys',
+	innerFurnaceNoURL: 'http://192.168.10.40/ezhizao-dms-p2',
 
 	// 外网
-	publicURL: 'http://36.129.132.128:8099',
-	outUpdateAppURL: 'http://36.129.132.128:401/ezhizao-dms-production',
-	outPdfAppURL: 'http://36.129.132.128:401/ezhizao-dms-sys',
-	outFurnaceNoURL: 'http://36.129.132.128:401/ezhizao-dms-p2'
+	publicURL: 'http://120.46.159.163:7004',
+	outUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
+	outPdfAppURL: 'http://120.46.159.163:401/ezhizao-dms-sys',
+	outFurnaceNoURL: 'http://120.46.159.163:401/ezhizao-dms-p2'
 })
 
 export default path

pages.json

@@ -223,24 +223,24 @@
 				"navigationBarTitleText": "查询批次信息"
 			}
 		},
-		{
-			"path": "pages/innerTurnover/index",
-			"style": {
-				"navigationBarTitleText": "内部周转"
-			}
-		},
-		{
-			"path": "pages/firstInspection/operatorIndex",
-			"style": {
-				"navigationBarTitleText": "首件检测"
-			}
-		},
-		{
-			"path": "pages/firstInspection/choseInspectionType",
-			"style": {
-				"navigationBarTitleText": "送检选择"
-			}
-		},
+		// {
+		// 	"path": "pages/innerTurnover/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "内部周转"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/firstInspection/operatorIndex",
+		// 	"style": {
+		// 		"navigationBarTitleText": "首件检测"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/firstInspection/choseInspectionType",
+		// 	"style": {
+		// 		"navigationBarTitleText": "送检选择"
+		// 	}
+		// },
 		{
 			"path": "pages/onSiteInspection/index",
 			"style": {
@@ -330,7 +330,7 @@
 			"style": {
 				"navigationBarTitleText": "辅助工序报工"
 			}
-		},{
+		}, {
 
 			"path": "pages/deliveryExamine/index",
 			"style": {

pages/auxiliaryDaywork/form.vue

@@ -21,6 +21,10 @@
 				<view class="label">辅助工序</view>
 				<view class="value">{{ auxiliaryDayworkItem.auxiliaryProcess.name }}</view>
 			</view>
+			<view class="info-row uni-row">
+				<view class="label">投产数量</view>
+				<view class="value">{{ auxiliaryDayworkItem.prodNum }}</view>
+			</view>
 		</view>
 
 		<!-- 废品信息 -->
@@ -64,10 +68,10 @@
 					<view class="value">{{ item.dayworkItem.endTime }}</view>
 				</view>
 				<view class="resu uni-row">
-					<view :class="!editable() ? 'label' : ''">投产数量</view>
-					<view class="number value">{{ item.prodNum }}</view>
+					<!-- <view :class="!editable() ? 'label' : ''">投产数量</view>
+					<view class="number value">{{ item.prodNum }}</view> -->
 					<view :class="!editable() ? 'label' : ''">合格数量</view>
-					<view class="value">{{ item.qualificationNum }}</view>
+					<view class="value">{{ item.qualifiedNum }}</view>
 					<view :class="!editable() ? 'label' : ''">废品量</view>
 					<input v-if="editable()" class="number" type="number" @blur="rejectNumberChange"
 						v-model="item.rejectNum" placeholder="" />
@@ -76,10 +80,17 @@
 			</view>
 		</view>
 		<!-- 报工部分 -->
-		<view class="daywork-container">
+		<view class="daywork-container uni-column unfit-item-container">
 			<view class="result uni-row">
 				<view class="label">废品总数</view>
 				<view class="value" style="margin-left: 10px;">{{ auxiliaryDayworkItem.rejectNum }}</view>
+
+			</view>
+			<view class="half-result uni-row">
+				<view class="label">合格数量</view>
+				<input v-if="editable()" class="number" type="number" v-model="auxiliaryDayworkItem.qualifiedNum"
+					placeholder="" style="width: 140rpx" />
+				<view v-else class="value">{{ auxiliaryDayworkItem.qualifiedNum }}</view>
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
@@ -134,15 +145,17 @@
 	})
 	const initStatus = ref(0)
 	const editable = () => {
-		if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:edit')) {
-			return true
-		}
-		if (initStatus.value == 0) {
-			return true
-		}
-		if (auxiliaryDayworkItem.value.firstUpdaterId == store.userInfo.userId) {
-			return true
+		// if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:edit')) {
+		// 	return true
+		// }
+		if (initStatus.value == 0 || initStatus.value == 1) {
+			if (auxiliaryDayworkItem.value.creatorId == store.userInfo.userId) {
+				return true
+			}
 		}
+		// if (auxiliaryDayworkItem.value.firstUpdaterId == store.userInfo.userId) {
+		// 	return true
+		// }
 		return false
 	}
 
@@ -250,6 +263,7 @@
 			sumReject += (v.rejectNum != null ? Number(v.rejectNum) : 0)
 			sumDisqualificationNum += (v.disqualificationNum != null ? Number(v.disqualificationNum) : 0)
 			sumExaminingNum += (v.examiningNum != null ? Number(v.examiningNum) : 0)
+			// v.qualifiedNum = Number(v.prodNum) - Number(v.rejectNum)
 		})
 		auxiliaryDayworkItem.value.rejectNum = sumReject
 		auxiliaryDayworkItem.value.disqualificationNum = sumDisqualificationNum
@@ -621,7 +635,39 @@
 
 					&.number {
 						width: 104rpx;
-						text-align: center;
+						text-align: left;
+					}
+				}
+			}
+
+			.half-result {
+				border-bottom: 1px solid #9f9f9f;
+				padding-bottom: 32rpx;
+				align-items: center;
+
+				.label {
+					width: 160rpx;
+				}
+
+				.value {
+					flex: 1;
+
+					textarea {
+						flex: 1;
+						border: 1px solid #888888;
+						box-sizing: border-box;
+						padding: 16rpx;
+					}
+				}
+
+				input {
+					width: 140rpx;
+					height: 56rpx;
+					border: 1px solid #9f9f9f;
+					font-size: 28rpx;
+
+					&.number {
+						text-align: left;
 					}
 				}
 			}
@@ -690,6 +736,28 @@
 				border: 1px solid #9f9f9f;
 				font-size: 28rpx;
 				text-align: center;
+
+			}
+		}
+
+		.half-result {
+			align-items: center;
+
+			.label {
+				width: 112rpx;
+			}
+
+			input {
+				width: 20px;
+				height: 56rpx;
+				border: 1px solid #9f9f9f;
+				font-size: 28rpx;
+				text-align: center;
+
+				&.number {
+					width: 104rpx;
+					text-align: left;
+				}
 			}
 		}
 

pages/auxiliaryDaywork/index.vue

@@ -34,6 +34,12 @@
 					<view class="label">产品描述：</view>
 					<view class="value">{{ item.productDescription }}</view>
 				</view>
+				<view class="info-row uni-row">
+					<view class="label">合格数量：</view>
+					<view class="value">{{ item.qualifiedNum }}</view>
+					<view class="label">废品数量：</view>
+					<view class="value">{{ item.rejectNum }}</view>
+				</view>
 				<view class="info-row uni-row">
 					<view class="label">生产工序：</view>
 					<view class="value">{{ item.processAlias }}</view>
@@ -271,7 +277,7 @@
 		const openItem = {
 			dayworkId: item.dayworkId,
 			processInspectionId: item.id,
-			daywork: item
+			daywork: item.daywork
 		}
 		uni.navigateTo({
 			url: "/pages/changeBox/index",

pages/auxiliaryDaywork/scan.vue

@@ -34,15 +34,15 @@
 				<view class="label">批次箱号</view>
 				<view class="value">{{ lot.allCarrierName }}</view>
 			</view>
-			<input type="text" v-model="carrierCode" placeholder="请输入箱号或检查载具号" />
+			<!-- <input type="text" v-model="carrierCode" placeholder="请输入箱号或检查载具号" /> -->
 			<view class="btn uni-row" style="background-color: #ff5555;" @click.stop="handleScanCode">
 				<uni-icons type="scan" size="16" style="color: #ffffff; margin-right: 8rpx;" />
 				<text>扫描箱码或载具二维码</text>
 			</view>
-			<view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleConfirm">箱码确定</view>
+			<!-- <view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleConfirm">箱码确定</view>
 			<view class="btn uni-row" style="background-color: #26d01d;" @click.stop="handleSave">保存
-			</view>
-			<!-- <view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleSave">保存</view> -->
+			</view> -->
+			<view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleSave">保存</view>
 		</view>
 		<!-- <dialog-processInspection ref='selectProcessInspection'
 			@handleSelectProcessInspection='handleSelectProcessInspection'></dialog-processInspection> -->
@@ -79,7 +79,7 @@
 	const carrierCode = ref('')
 	const lot = ref({})
 	const query = ref({})
-	const selectProcessInspection = ref(null)
+	const selectDaywork = ref(null)
 	const lastRequestTimestamp = ref(0);
 	const auxiliaryProcesses = ref([])
 	const processes = ref([])
@@ -125,12 +125,12 @@
 							if (response.data != null) {
 								if (response.data.length > 1) {
 									query.value = result;
-									selectProcessInspection.value.open(response.data)
+									selectDaywork.value.open(response.data)
 								} else {
 									// console.log(response)
-									// uni.showLoading({
-									// 	title: '加载中'
-									// })
+									uni.showLoading({
+										title: '加载中'
+									})
 									uni.hideLoading()
 									lot.value = response.data[0]
 									processes.value = lot.value.processSequence.map(v => ({
@@ -158,7 +158,7 @@
 			)
 		} else {
 			const result = {
-				carrierCode: '000657',
+				carrierCode: '100040',
 				processCode: store.outsourcedCode
 			}
 			getInfoByCarrierCode(result).then(response => {
@@ -168,12 +168,12 @@
 					if (response.data != null) {
 						if (response.data.length > 1) {
 							query.value = result;
-							selectProcessInspection.value.open(response.data)
+							selectDaywork.value.open(response.data)
 						} else {
 							// console.log(response)
-							// uni.showLoading({
-							// 	title: '加载中'
-							// })
+							uni.showLoading({
+								title: '加载中'
+							})
 							uni.hideLoading()
 							lot.value = response.data[0]
 							processes.value = lot.value.processSequence.map(v => ({
@@ -270,7 +270,7 @@
 					if (response.data != null) {
 						if (response.data.length > 1) {
 							query.value = result;
-							selectProcessInspection.value.open(response.data)
+							selectDaywork.value.open(response.data)
 						} else {
 							// console.log(response)
 							uni.showLoading({

pages/outsourcedInspection/form.vue

@@ -211,6 +211,9 @@
 	})
 	const initStatus = ref(0)
 	const editable = () => {
+		if (processInspecion.value.auditStatus == 1) {
+			return false
+		}
 		if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:edit')) {
 			return true
 		}