0307

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

@@ -125,7 +125,7 @@
 						specialDeptProcessList.value[i] = res.data[i].processId;
 					}
 					for (let i = 0; i < response.rows.length; i++) {
-						if (response.rows[i].processId == workInfo.value.processId) {
+						if (response.rows[i].processStepNumber == workInfo.value.processStepNumber) {
 							lotPreSumReject.value += response.rows[i].rejectSum;
 							lotPreSumQualifiedNum.value += response.rows[i].qualifiedNum;
 						}

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

@@ -137,7 +137,7 @@
 						specialDeptProcessList.value[i] = res.data[i].processId;
 					}
 					for (let i = 0; i < response.rows.length; i++) {
-						if (response.rows[i].processId == workInfo.value.processId) {
+						if (response.rows[i].processStepNumber == workInfo.value.processStepNumber) {
 							lotPreSumReject.value += response.rows[i].rejectSum;
 							lotPreSumQualifiedNum.value += response.rows[i].qualifiedNum;
 						}

components/dialog-lotInfo/dialog-lotInfo.vue

@@ -141,7 +141,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}

manifest.json

@@ -1,123 +1,123 @@
 {
-    "name" : "(测试)德迈仕数字生产管理平台",
-    "appid" : "__UNI__54D8B02",
-    "description" : "",
-    "versionName" : "1.0.42",
-    "versionCode" : 142,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CLEAR_APP_CACHE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "static/images/logo.png",
-                    "xhdpi" : "static/images/logo.png",
-                    "xxhdpi" : "static/images/logo.png",
-                    "xxxhdpi" : "static/images/logo.png"
-                }
-            }
-        },
-        "nativePlugins" : {
-            "Mpaas-Scan" : {
-                "AppId" : "ALIPUB4932DAD011111",
-                "WorkspaceId" : "default",
-                "License" : "VZ3AAAaaRxg4UtCoQ341QVyKxVeiNTC7We+Ob/K3nHDlOHGRhby9ojOmdC1bEFSkfXPkNOdV83kRh8OXFyGQcAE2HQkz0vkrMw/DkXdq1OcSpgsIfZIEX6IT3PRic3dnnSbf92+EjUJkMwjwRex6zLFNbTJjypY+p1CcZhmDqmuBiUvlb6QNyLyyHk8JVpw25o+dYm5Zdjsqw9hjUPqqyUIG4KX6iiBKToJW/ZqIGmf2OooiSa+wxGdYBS2vcESkS3Hxfj6oxCR5Zu2pXl+9UNyPWe1jmC0yRPBXHfmB0mmghHFp0vuDusj0r7KQMs873Z9ftiDmFq/7O//qvg3fzA==",
-                "__plugin_info__" : {
-                    "name" : "支付宝原生扫码插件",
-                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘，",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "AppId" : {
-                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
-                            "key" : "mobilegw.appid",
-                            "value" : ""
-                        },
-                        "WorkspaceId" : {
-                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
-                            "key" : "workspaceId",
-                            "value" : ""
-                        },
-                        "License" : {
-                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
-                            "key" : "mpaasConfigLicense",
-                            "value" : ""
-                        }
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3"
-}
+	"name": "(测试)德迈仕数字生产管理平台",
+	"appid": "__UNI__54D8B02",
+	"description": "",
+	"versionName": "1.0.44",
+	"versionCode": 144,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Barcode": {},
+			"Camera": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CLEAR_APP_CACHE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "static/images/logo.png",
+					"xhdpi": "static/images/logo.png",
+					"xxhdpi": "static/images/logo.png",
+					"xxxhdpi": "static/images/logo.png"
+				}
+			}
+		},
+		"nativePlugins": {
+			"Mpaas-Scan": {
+				"AppId": "ALIPUB4932DAD011111",
+				"WorkspaceId": "default",
+				"License": "VZ3AAAaaRxg4UtCoQ341QVyKxVeiNTC7We+Ob/K3nHDlOHGRhby9ojOmdC1bEFSkfXPkNOdV83kRh8OXFyGQcAE2HQkz0vkrMw/DkXdq1OcSpgsIfZIEX6IT3PRic3dnnSbf92+EjUJkMwjwRex6zLFNbTJjypY+p1CcZhmDqmuBiUvlb6QNyLyyHk8JVpw25o+dYm5Zdjsqw9hjUPqqyUIG4KX6iiBKToJW/ZqIGmf2OooiSa+wxGdYBS2vcESkS3Hxfj6oxCR5Zu2pXl+9UNyPWe1jmC0yRPBXHfmB0mmghHFp0vuDusj0r7KQMs873Z9ftiDmFq/7O//qvg3fzA==",
+				"__plugin_info__": {
+					"name": "支付宝原生扫码插件",
+					"description": "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘，",
+					"platforms": "Android,iOS",
+					"url": "",
+					"android_package_name": "",
+					"ios_bundle_id": "",
+					"isCloud": false,
+					"bought": -1,
+					"pid": "",
+					"parameters": {
+						"AppId": {
+							"des": "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+							"key": "mobilegw.appid",
+							"value": ""
+						},
+						"WorkspaceId": {
+							"des": "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+							"key": "workspaceId",
+							"value": ""
+						},
+						"License": {
+							"des": "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+							"key": "mpaasConfigLicense",
+							"value": ""
+						}
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "3"
+}

pages/assistDaywork/index.vue

@@ -271,7 +271,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}

pages/batchReporting/index.vue

@@ -274,7 +274,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}

pages/batchReportingOutsource/index.vue

@@ -258,7 +258,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}

pages/queryLotInfo/index.vue

@@ -411,72 +411,72 @@
 	//扫码
 	function handleScanCode() {
 		//引入原生插件
-		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		if (mpaasScanModule) {
-			// 调用插件的 mpaasScan 方法
-			mpaasScanModule.mpaasScan({
-					// 扫码识别类型，参数可多选，qrCode、barCode，
-					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-					scanType: ["qrCode", "barCode"],
-					// 是否隐藏相册，默认false不隐藏
-					hideAlbum: false,
-				},
-				(ret) => {
-					console.log(ret);
-					let vehicleObj = {
-						carrierCode: ret.resp_result
-					};
-					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
-						uni.showToast({
-							icon: "none",
-							title: "请扫载具码",
-							duration: 1000
-						})
-						return;
-					}
-					getDayworkCarrierByCarrierCode({
-						carrierCode: vehicleObj.carrierCode,
-					}).then(response => {
-						if (response.code == 200) {
-							if (response.data.length > 0) {
-								if (response.data.length > 1) {
-									selectLotDialog.value.open(response.data);
-								} else {
-									handleDoIt(response.data[0])
-								}
-							} else {
-								uni.showToast({
-									icon: 'none',
-									title: "该箱未绑定批次,请重新扫码",
-									duration: 2000
-								})
-							}
-						}
-					})
-				}
-			);
-		} else {
-			// 测试时用
-			getDayworkCarrierByCarrierCode({
-				carrierCode: '009283'
-			}).then(res => {
-				if (res.code == 200) {
-					if (res.data.length > 0) {
-						if (res.data.length > 1) {
-							selectLotDialog.value.open(res.data);
-						} else {
-							handleDoIt(res.data[0])
-						}
+		// const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		// if (mpaasScanModule) {
+		// 	// 调用插件的 mpaasScan 方法
+		// 	mpaasScanModule.mpaasScan({
+		// 			// 扫码识别类型，参数可多选，qrCode、barCode，
+		// 			// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+		// 			scanType: ["qrCode", "barCode"],
+		// 			// 是否隐藏相册，默认false不隐藏
+		// 			hideAlbum: false,
+		// 		},
+		// 		(ret) => {
+		// 			console.log(ret);
+		// 			let vehicleObj = {
+		// 				carrierCode: ret.resp_result
+		// 			};
+		// 			if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
+		// 				uni.showToast({
+		// 					icon: "none",
+		// 					title: "请扫载具码",
+		// 					duration: 1000
+		// 				})
+		// 				return;
+		// 			}
+		// 			getDayworkCarrierByCarrierCode({
+		// 				carrierCode: vehicleObj.carrierCode,
+		// 			}).then(response => {
+		// 				if (response.code == 200) {
+		// 					if (response.data.length > 0) {
+		// 						if (response.data.length > 1) {
+		// 							selectLotDialog.value.open(response.data);
+		// 						} else {
+		// 							handleDoIt(response.data[0])
+		// 						}
+		// 					} else {
+		// 						uni.showToast({
+		// 							icon: 'none',
+		// 							title: "该箱未绑定批次,请重新扫码",
+		// 							duration: 2000
+		// 						})
+		// 					}
+		// 				}
+		// 			})
+		// 		}
+		// 	);
+		// } else {
+		// 测试时用
+		getDayworkCarrierByCarrierCode({
+			carrierCode: '078965'
+		}).then(res => {
+			if (res.code == 200) {
+				if (res.data.length > 0) {
+					if (res.data.length > 1) {
+						selectLotDialog.value.open(res.data);
 					} else {
-						uni.showToast({
-							icon: 'none',
-							title: "该箱未绑定批次,请重新扫码",
-							duration: 2000
-						})
+						handleDoIt(res.data[0])
 					}
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: "该箱未绑定批次,请重新扫码",
+						duration: 2000
+					})
 				}
-			})
-		}
+			}
+		})
+		// }
 	}
 
 	function handleDoIt(data) {
@@ -589,7 +589,7 @@
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[item.dayworkItemList.length - 1].place == "" ? item.dayworkItemList[item
 				.dayworkItemList.length - 1].turnoverArea == "" ?
-			'-' : item.dayworkItemList[item.dayworkItemList.length - 1].turnoverArea : item.dayworkItemList[item
+			'-' : '默认周转区' : item.dayworkItemList[item
 				.dayworkItemList.length - 1].place
 		let deptName = item.dayworkItemList[item.dayworkItemList.length - 1].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place

pages/sortBatchInnerReporting/index.vue

@@ -247,7 +247,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}

pages/sortBatchReporting/index.vue

@@ -250,7 +250,7 @@
 
 	function getPlaceText(item) {
 		let place = item.dayworkItemList[0].place == "" ? item.dayworkItemList[0].turnoverArea == "" ?
-			'-' : item.dayworkItemList[0].turnoverArea : item.dayworkItemList[0].place
+			'-' : '默认周转区' : item.dayworkItemList[0].place
 		let deptName = item.dayworkItemList[0].deptName
 		return place == "-" ? deptName == "" ? "-" : deptName : deptName + "-" + place
 	}