1.8

components/dialog-end-work/dialog-end-work.vue

@@ -106,6 +106,14 @@
 	}
 
 	function handleFinishReporting() {
+		if(!workInfo.value.qualifiedNum){
+			uni.showToast({
+				icon: "error",
+				title: "请输入合格数",
+				duration: 2000
+			})
+			return;
+		}
 		for (let i = 0; i < wasteInfo.value.length; i++) {
 			if ((!wasteInfo.value[i].rejectNum && wasteInfo.value[i].reason) ||
 			 (wasteInfo.value[i].rejectNum && !wasteInfo.value[i].reason) || 

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -8,13 +8,14 @@
 					@click="selectTurnoverType(item)"><text class="label">{{item.dictLabel}}</text></view>
 			</view>
 			<view class="" style="margin: 0 20rpx 20rpx 0;width: 88%;">
-				<uni-section title="请选择周转工段" title-font-size="32rpx" style="margin: 0 0 0 -16rpx;">
+				<uni-section title="请选择下序工段" title-font-size="32rpx" style="margin: 0 0 0 -16rpx;">
 					<uni-data-select v-model="curDayworkItem.deptId" :localdata="deptList" @change="handleChange"
+					:clear="false"
 						style="margin: 0 0 0 16rpx;outline: 2rpx solid #999999;border-radius: 10rpx;"></uni-data-select>
 				</uni-section>
 			</view>
 			<view class="list-title" v-if="curDayworkItem.turnoverType == '1'">
-				<text class="label">请选择周转区</text>
+				<text class="label">请选择您摆放位置</text>
 			</view>
 			<view class="turnArea uni-row" v-if="curDayworkItem.turnoverType == '1'">
 				<view v-for="(item,index) in turnAreaList" class="btn">
@@ -23,7 +24,7 @@
 				</view>
 			</view>
 			<view class="list-title" v-if="curDayworkItem.turnoverType == '2'">
-				<text class="label">请选择周转位置</text>
+				<text class="label">请选择您摆放位置</text>
 			</view>
 			<view class="turnArea uni-row" v-if="curDayworkItem.turnoverType == '2'">
 				<view v-for="(item,index) in turnoverArea" class="btn">

pages/addNewBatch/index.vue

@@ -161,6 +161,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'],
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				let vehicleObj = JSON.parse(res.result);
 				if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {

pages/batchReporting/index.vue

@@ -218,6 +218,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'],
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				console.log(res.result)
 				let vehicleObj = JSON.parse(res.result);
@@ -236,7 +237,6 @@
 					if (response.code == 200) {
 						console.log(response)
 						lotDialog.value.open(response.data);
-						// reqParam.value = response.data
 					}
 				})
 			}

pages/changeBox/index.vue

@@ -68,6 +68,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'], // 条形码扫描
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				let vehicleObj = JSON.parse(res.result);
 				if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {

pages/dashboard/index.vue

@@ -17,7 +17,8 @@
 		</view>
 		<view class="user-info uni-column" style="margin: 0 20rpx 20rpx 20rpx;width: 94%;">
 			<uni-section title="当前厂别" type="line">
-				<uni-data-select v-model="userInfo.tenantId" :localdata="tenantList"
+				<uni-data-select v-model="userInfo.tenantId" :localdata="tenantList" 
+					:clear="false"
 					@change="handleTenantChange"></uni-data-select>
 			</uni-section>
 		</view>
@@ -75,25 +76,25 @@
 			url: '/pages/recerptSfprod/index'
 		})
 	}
-	
+
 	function handleToProductionPlan() {
 		uni.navigateTo({
 			url: '/pages/productionPlan/index'
 		})
 	}
-	
+
 	function handleToHandlingList() {
 		uni.navigateTo({
 			url: '/pages/handlingList/index'
 		})
 	}
-	
-	function logout(){
+
+	function logout() {
 		uni.reLaunch({
 			url: '/pages/index/index'
 		})
 	}
-	
+
 	function handleSwitchOrQuit() {
 		let msg = "确认退出登录吗?"
 		confirm.value.open(msg);
@@ -139,6 +140,7 @@
 		height: calc(100% - 208rpx);
 		overflow: auto;
 	}
+
 	.logo-container {
 		justify-content: center;
 

pages/equipmentList/index.vue

@@ -106,6 +106,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'], // 条形码扫描
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				console.log(res.result)
 				let equipment = JSON.parse(res.result);

pages/index/index.vue

@@ -11,6 +11,14 @@
 			<input v-model="baseUrl" placeholder="服务器地址" />
 			<button @click="handleSetting">设置</button>
 		</view>
+		<view class="add-user-btn uni-row" @click="handleShowLoginDialog(null)">
+			<view class="icon uni-row">
+				<text class="label">+</text>
+			</view>
+			<view class="btn-label">
+				<text class="label">添加新账号</text>
+			</view>
+		</view>
 		<view v-for="(item, index) in loggedUsers" class="item-user uni-row" @click="handleSelectUser(item)"
 			@longpress="handleLongPressUser(item)">
 			<view class="user-avatar uni-row"><text class="label">{{ item.nickName.charAt(0) }}</text></view>
@@ -23,15 +31,6 @@
 				</view>
 			</view>
 		</view>
-		<view class="add-user-btn uni-row" @click="handleShowLoginDialog(null)">
-			<view class="icon uni-row">
-				<text class="label">+</text>
-			</view>
-			<view class="btn-label">
-				<text class="label">添加新账号</text>
-			</view>
-		</view>
-
 		<dialog-login ref="loginDialog" />
 	</view>
 </template>

pages/productionPlan/index.vue

@@ -101,7 +101,7 @@
 		init(initReqParam.value);
 	}
 
-	function init(data = {}) {
+	function init(data) {
 		uni.showLoading({
 			title: '加载中'
 		});

pages/recerptSfprod/index.vue

@@ -63,6 +63,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'],
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				console.log(res.result)
 				let vehicleObj = JSON.parse(res.result);

pages/reportingForWork/index.vue

@@ -35,7 +35,11 @@
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">废品数</text>
-					<text class="label right">{{ item['rejectNum']}}</text>
+					<text class="label right">{{ item['rejectSum'] ? item['rejectSum'] : 0 }}</text>
+				</view>
+				<view class="item-info uni-row">
+					<text class="label">设备</text>
+					<text class="label right">{{ item['equipmentDetailCode']}}</text>
 				</view>
 				<!-- 		<view class="item-info uni-row">
 					<text class="label">废品原因</text>
@@ -173,9 +177,8 @@
 		}else{
 			if (flag.value) {
 				uni.showToast({
-					icon: "error",
-					title: "当前有未完成报工记录",
-					duration: 1000
+					icon: "none",
+					title: "报工未结束或工序已完成"
 				})
 			} else {
 				selectEquipment.value.open(item);

pages/startTurnover/index.vue

@@ -79,6 +79,7 @@
 		uni.scanCode({
 			scanType: ['qrCode'],
 			onlyFromCamera: true, // 只允许相机扫码
+			autoZoom: false,
 			success: function(res) {
 				console.log(res.result)
 				let vehicleObj = JSON.parse(res.result);