H5

components/dialog-lotReporting/dialog-lotReporting.vue

@@ -245,8 +245,9 @@
 		// 然后关闭dialog
 		// console.log(props)
 		addDayworkItem(() => {
-			baseDialog.value.close()
 			props.getList()
+			baseDialog.value.close()
+
 		})
 	}
 	//打开电子图纸

manifest.json

@@ -1,123 +1,123 @@
 {
-    "name" : "(测试)德迈仕数字生产管理平台",
-    "appid" : "__UNI__54D8B02",
-    "description" : "",
-    "versionName" : "1.0.23",
-    "versionCode" : 123,
-    "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.30",
+	"versionCode": 130,
+	"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/dashboard/index.vue

@@ -301,19 +301,26 @@
 
 	//根据权限判断是否全部展示分选报工和普通报工
 	function dayworkall(tape) {
-		console.log("tape", tape);
-		console.log("store.userInfo.permissions", store.userInfo.permissions);
+
+		console.log("tape", tape)
+		console.log("showQuick", showQuick.value);
 		//判断是否有权限，如果没有权限则判断按钮类型
-		if (store.userInfo.permissions.some(item => item === 'business:dawworkAll:list') || store.userInfo
-			.permissions.some(item => item === "*:*:*") && !showQuick.value) {
+		if (!showQuick.value && (store.userInfo.permissions.some(item => item === 'business:dawworkAll:list') || store
+				.userInfo.permissions
+				.some(item => item === "*:*:*"))) {
 			// 有权限则全部展示
+			console.log("有权限");
 			return true
 		} else if (tape === "showOther") { //普通报工按钮判断
 			return (showOther.value && !showSizing.value && !showOutsource.value)
 		} else if (tape === "showSizing") { //分选报工按钮判断
 			return (showSizing.value && !showOutsource.value)
 		}
+		if (!tape) {
+			return false
+		}
 
+		console.log("无权限");
 	}
 
 	// 获取人员工段

pages/fastProductionPlan/index.vue

@@ -122,6 +122,7 @@
 
 	// 创建一个引用来存储最后一次请求的时间戳
 	const lastRequestTimestamp = ref(0);
+	const isLoading = ref(false)
 	const listData = ref([]);
 	const allData = ref([])
 	const selection = ref([]); //选中数据
@@ -139,6 +140,7 @@
 		getQuickDayworkList({
 			deptId: store.curDeptDetails.deptId,
 		}).then(res => {
+			isLoading.value = false;
 			// console.log(res)
 			if (res.code == 200) {
 				allData.value = res.rows
@@ -434,8 +436,8 @@
 		// console.log(workshop)
 		// console.log()
 		listData.value = allData.value.filter(v => workshop.depts.some(e => e.deptId === v.quickInfo.deptId) && (v.lotCode
-			.includes(keyword.value) || v.productDescription.includes(keyword.value) || v.carrierName.includes(
-				keyword.value)))
+			.includes(keyword.value) || v.productDescription.includes(keyword.value) || (v.carrierName != null && v
+				.carrierName.includes(keyword.value))))
 		selection.value = []
 	}
 
@@ -483,20 +485,7 @@
 			})
 			return
 		}
-		const currentTime = Date.now();
 
-		// 检查是否已经过去了 2 秒
-		if (currentTime - lastRequestTimestamp.value < 2000) {
-			// 如果在 2 秒 内已经有请求发出，那么不执行
-			uni.showToast({
-				icon: 'none',
-				title: `请勿重复点击`,
-				duration: 2000
-			})
-			return;
-		}
-		lastRequestTimestamp.value = currentTime;
-		// 更新请求时间戳
 		isTakeStock().then(response => {
 			if (response.data) {
 				uni.showToast({
@@ -510,12 +499,11 @@
 				uni.showLoading({
 					title: '加载中'
 				});
-				lastRequestTimestamp.value = currentTime;
 				selection.value.forEach(item => {
 					item.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 				})
 				finishQuick(selection.value).then(res => {
-					isLoading.value = false; // 显示遮罩层
+
 					uni.hideLoading();
 					// console.log(res)
 					if (res.code === 200) {