~jt/MES-PDA.git

			@@ -516,7 +516,7 @@
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}

			@@ -547,7 +547,7 @@
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}

			@@ -582,7 +582,7 @@
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -623,7 +623,7 @@
			title: this.translateSys("error") + "3",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -654,14 +654,14 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + result
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return false;
			} else {
			@@ -671,7 +671,7 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			if (result.result_type == 0 && result.action) {
			@@ -694,7 +694,7 @@
			title: this.translateSys("tip"),
			content: result.info,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			}
			@@ -708,7 +708,7 @@
			"comma") +
			tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			}
			@@ -872,7 +872,7 @@
			title: this.translateSys("error") + "5.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			});
			} catch (ex) {
			@@ -881,7 +881,7 @@
			title: this.translateSys("error") + "5.2",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -937,7 +937,7 @@
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			}
			}
			@@ -1013,7 +1013,7 @@
			title: this.translateSys("tip"),
			content: this.translateSys("unrealized"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			} else if (btn.FunCode == "Delete") {
			@@ -1033,7 +1033,7 @@
			title: this.translateSys("tip"),
			content: this.translateSys("unrealized"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			} catch (ex) {
			@@ -1042,7 +1042,7 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -1108,7 +1108,7 @@
			"delete_success"),
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			}).catch(ex => {
			// console.log(ex);
			@@ -1118,7 +1118,7 @@
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			});
			} else if (res.cancel) {
			@@ -1181,7 +1181,7 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			@@ -1190,7 +1190,7 @@
			result
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return false;
			} else {
			@@ -1202,7 +1202,7 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			}
			@@ -1212,7 +1212,7 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			this.showError(ex);
			}
			@@ -1261,7 +1261,7 @@
			'tip_no_app_param'),
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			return;
			}
			@@ -1286,7 +1286,7 @@
			content: this.translate(
			"function_not_exist"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}

			@@ -1295,7 +1295,7 @@
			title: this.translateSys("error"),
			content: this.translate("cannot_related_function"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			}
			@@ -1309,7 +1309,7 @@
			title: this.translateSys("error"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return undefined
			}
			@@ -1332,7 +1332,7 @@
			title: this.translateSys("error") + "7",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -1474,7 +1474,7 @@
			content: tip,
			showCancel: false,
			confirmText: this
			.translateSys("cancel")
			.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys(
			@@ -1486,7 +1486,7 @@
			.ret,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			return false;
			} else {
			@@ -1500,7 +1500,7 @@
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});

			if (result.result_type == 0 && result
			@@ -1545,7 +1545,7 @@
			showCancel: false,
			confirmText: this
			.translateSys(
			"cancel")
			'close')
			});
			}
			}
			@@ -1560,7 +1560,7 @@
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			});
			}
			@@ -1575,7 +1575,7 @@
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			}
			@@ -1618,7 +1618,7 @@
			content: tip,
			showCancel: false,
			confirmText: this
			.translateSys("cancel")
			.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys(
			@@ -1629,7 +1629,7 @@
			result.ret,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			return false;
			} else {
			@@ -1643,7 +1643,7 @@
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});

			if (result.result_type == 0 && result
			@@ -1719,7 +1719,7 @@
			showCancel: false,
			confirmText: this
			.translateSys(
			"cancel"
			'close'
			)
			});
			}
			@@ -1734,7 +1734,7 @@
			showCancel: false,
			confirmText: this
			.translateSys(
			"cancel")
			'close')
			});
			}
			}
			@@ -1749,7 +1749,7 @@
			content: ex.errMsg,
			showCancel: false,
			confirmText: this.translateSys(
			"cancel")
			'close')
			});
			});
			} catch (ex) {
			@@ -1762,7 +1762,7 @@
			this.translate('reason') + this.translateSys(
			"colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			}
			@@ -2241,7 +2241,7 @@
			margin-top: 25rpx;
			padding: 20rpx;
			line-height: 1.5;
			background: #4D6AF4;
			background: #27A6E1;
			border: none;
			color: #fff;
			font-size: 38rpx;
			@@ -2256,8 +2256,8 @@
			padding: 20rpx;
			line-height: 1.5;
			background: #fff;
			border: none;
			color: #000;
			// border: none;
			color: #000;
			font-size: 38rpx;
			font-weight: bold;
			float: left;