搬运任务加提示框

locale/en.json

@@ -57,5 +57,7 @@
 	"regenerate": "Regenerate",
 	"forced-completion": "Forced completion",
 	"take-and-place": "Take and place",
-	"filter.point": "Point"
+	"filter.point": "Point",
+	"warning": "Warning",
+	"toast.command-reissue": "Do you need to issue it?"
 }

locale/ko.json

@@ -57,5 +57,7 @@
 	"regenerate": "재생성",
 	"forced-completion": "강제 완료",
 	"take-and-place": "픽업 허용",
-	"filter.point": "포인트"
+	"filter.point": "포인트",
+	"warning": "힌트",
+	"toast.command-reissue": "발송해야 하나요?"
 }

locale/zh-Hans.json

@@ -57,5 +57,7 @@
 	"regenerate": "重新生成",
 	"forced-completion": "强制完成",
 	"take-and-place": "允许取放",
-	"filter.point": "点位"
+	"filter.point": "点位",
+	"warning": "提示",
+	"toast.command-reissue": "是否需要下发？"
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "DOOSAN",
     "appid" : "__UNI__3898904",
     "description" : "韩国斗山acs手持系统",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
-    "versionCode" : 100,
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/login/login.vue

@@ -71,19 +71,7 @@
 				// 	url: '/pages/home/home'
 				// })
 				this.disabled = true
-				if (this.user === '') {
+				if (this.user === '' || this.password === '') {
-					uni.showToast({
-						title: '用户名不能为空',
-						icon: 'none'
-					})
-					this.disabled = false
-					return
-				}
-				if (this.password === '') {
-					uni.showToast({
-						title: '密码不能为空',
-						icon: 'none'
-					})
 					this.disabled = false
 					return
 				}

pages/manage/call-manage.vue

@@ -20,7 +20,7 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-22 button-primary" :disabled="disabled" @tap="_callTask('1')">{{$t('button.handtask')}}</button>
+			<button class="zd-col-22 button-primary" :disabled="disabled" @tap="toSure('1')">{{$t('button.handtask')}}</button>
 		</view>
 	</view>
 </template>
@@ -44,8 +44,23 @@
 			this.title = options.title
 		},
 		methods: {
-			async _callTask (type) {
+			toSure (type) {
 				this.disabled = true
+				uni.showModal({
+					title: this.$t('warning'),
+					cancelText: this.$t('button.cancel'),
+					confirmText: this.$t('button.confirm'),
+					content: this.$t('toast.command-reissue'),
+					success: (res) => {
+						if (res.confirm) {
+							this._callTask(type)
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
+			async _callTask (type) {
 				try {
 					let res = await callTask(this.sCode, this.nCode, type)
 					this.disabled = false