diff --git a/pages.json b/pages.json index 1b9ac65..01fc33c 100644 --- a/pages.json +++ b/pages.json @@ -167,6 +167,13 @@ } } + ,{ + "path" : "pages/SecondPhase/finished/CheckToStore", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/SecondPhase/finished/abnorToStore", "style" : diff --git a/pages/SecondPhase/finished/CheckToStore.vue b/pages/SecondPhase/finished/CheckToStore.vue new file mode 100644 index 0000000..2d27f6c --- /dev/null +++ b/pages/SecondPhase/finished/CheckToStore.vue @@ -0,0 +1,96 @@ + + + \ No newline at end of file diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue index c3fcf80..b659bef 100644 --- a/pages/SecondPhase/finished/abnorToStore.vue +++ b/pages/SecondPhase/finished/abnorToStore.vue @@ -10,6 +10,12 @@ + + {{$t('filter.is_un_cap')}} + + + + {{$t('filter.box-no')}} @@ -38,7 +44,7 @@ - + @@ -58,6 +64,8 @@ title: '', options: [{value: '1', text: this.$t('select.return-inspection-warehousing')}, {value: '2', text: this.$t('select.recut-warehousing')}, {value: '0001', text: this.$t('select.production-warehousing')}, {value: '0009', text: this.$t('select.manual-warehousing')}], index: '', + options2: [{value: '1', text: this.$t('select.yes')}, {value: '0', text: this.$t('select.no')}], + index2: '', val1: '', val2: '', val3: '', @@ -71,8 +79,11 @@ selectChange (e) { this.index = e }, + selectChange2 (e) { + this.index2 = e + }, async handleConfirm() { - if (!this.index || !this.val1 || !this.val2 || !this.val3) { + if (!this.index || !this.index2 || !this.val1 || !this.val2 || !this.val3) { return } const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) @@ -83,7 +94,7 @@ async _twoPdaReback () { this.disabled = true try { - let res = await twoPdaReback(this.index, this.val1, this.val2, this.val3) + let res = await twoPdaReback(this.index, this.index2, this.val1, this.val2, this.val3) uni.showToast({ title: res.message, icon: 'none' @@ -96,6 +107,7 @@ }, clearUp () { this.index = '' + this.index2 = '' this.val1 = '' this.val2 = '' this.val3 = ''