diff --git a/locale/en.json b/locale/en.json index d83ac76..4f3e4bc 100644 --- a/locale/en.json +++ b/locale/en.json @@ -57,5 +57,5 @@ "regenerate": "Regenerate", "forced-completion": "Forced completion", "take-and-place": "Take and place", - "allow-to-leave": "Allow to leave" + "filter.point": "Point" } \ No newline at end of file diff --git a/locale/ko.json b/locale/ko.json index 67cb7cf..5084b5e 100644 --- a/locale/ko.json +++ b/locale/ko.json @@ -57,5 +57,5 @@ "regenerate": "재생성", "forced-completion": "강제 완료", "take-and-place": "픽업 허용", - "allow-to-leave": "떠날 것을 허락하다" + "filter.point": "포인트" } \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index cd13c52..743ea10 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -57,5 +57,5 @@ "regenerate": "重新生成", "forced-completion": "强制完成", "take-and-place": "允许取放", - "allow-to-leave": "允许离开" + "filter.point": "点位" } \ No newline at end of file diff --git a/pages/manage/release-confirm.vue b/pages/manage/release-confirm.vue index 3032ebc..74a6099 100644 --- a/pages/manage/release-confirm.vue +++ b/pages/manage/release-confirm.vue @@ -3,25 +3,19 @@ - - - {{$t('call.sp')}} - - + + + {{$t('filter.point')}} - - - - {{$t('call.ep')}} - - + + - - + + @@ -35,21 +29,33 @@ }, data() { return { + placeholder: this.$t('uni.dataSelect.placeholder'), title: '', - disabled: false, - sCode: 'QFQ_2', - nCode: 'QFQ_4' + options: [{text:'QFQ_2', value:'QFQ_2'},{text:'QFQ_4',value: 'QFQ_4'}], + index: '', + disabled: false }; }, onLoad (options) { this.title = options.title }, methods: { + selectChange (e) { + this.index = e + this.disabled = false + }, + cancle () { + this.index = '' + }, async _updateTask (type) { this.disabled = true - try { - let res = await updateTask(this.sCode, this.nCode, type) + if (!this.index) { this.disabled = false + return + } + try { + let res = await updateTask(this.index, type) + this.cancle() uni.showToast({ title: res.desc, icon: 'none' diff --git a/utils/getData2.js b/utils/getData2.js index c2f31d7..36985b6 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -88,11 +88,10 @@ export const handTaskoperation = (type, id) => request({ /** * 放货确认 */ -export const updateTask = (code1,code2,type) => request({ +export const updateTask = (code,type) => request({ url:'api/wms/updateTask', data: { - device_code: code1, - task_code: code2, + device_code: code, option: type } }) \ No newline at end of file