diff --git a/src/pages/raw/handover/RUS-picking/index.vue b/src/pages/raw/handover/RUS-picking/index.vue
index 614c7ed..43d4217 100644
--- a/src/pages/raw/handover/RUS-picking/index.vue
+++ b/src/pages/raw/handover/RUS-picking/index.vue
@@ -32,6 +32,10 @@
{{ $t('message.workArea_Selelct') }}
+
+
+ {{ $t('message.delete') }}
+
@@ -61,12 +65,20 @@ import { Component, Ref, Watch } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm } from 'vue/types/form';
import model from './model';
+import jPicker from '@/components/J-Picker/jPicker.vue';
import { headers } from './config';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { session } from '@/store/modules/session';
-
-@Component
+interface OptionType {
+ label: string;
+ value: string;
+}
+@Component({
+ components: {
+ jPicker,
+ },
+})
export default class pickingDom extends BasePage {
/**
* 表单引用
@@ -91,6 +103,9 @@ export default class pickingDom extends BasePage {
/**
* 表单数据
*/
+ formone = {
+ aimWl: {} as OptionType,
+ };
form = {
mrpCodeRegion: '',
mrpCodeIncludeList: '',
@@ -104,6 +119,11 @@ export default class pickingDom extends BasePage {
sendSpotList: '',
requireDateRegion: '',
};
+ CategoryList = [
+ { lable: 'L1CA', value: 'L1CA' },
+ { lable: 'L1DA', value: 'L1DA' },
+ { lable: 'L1FA', value: 'L1FA' },
+ ];
startParams = {
year: true,
month: true,
@@ -197,6 +217,10 @@ export default class pickingDom extends BasePage {
startConfirm(startParams: any) {
this.form.requireDateRegion = startParams.year + '-' + startParams.month + '-' + startParams.day;
}
+ bookTypeChange(e: any) {
+ console.log('///', e);
+ this.formone.aimWl = e.pickerName;
+ }
/**
* 确认
*/
@@ -233,7 +257,7 @@ export default class pickingDom extends BasePage {
onQuery() {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
- await this.model.queryProOrder(this.formParams);
+ await this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
this.model.checkAllProOrderList(true);
this.isFormChange = false;
model.mrpCodeRegion = this.form.mrpCodeRegion as any;
@@ -241,6 +265,14 @@ export default class pickingDom extends BasePage {
model.formParams = this.formParams;
});
}
+ ondelete() {
+ this.formone.aimWl.value = '';
+ this.CategoryList = [
+ { lable: 'L1CA', value: 'L1CA' },
+ { lable: 'L1DA', value: 'L1DA' },
+ { lable: 'L1FA', value: 'L1FA' },
+ ];
+ }
}
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index fc080dd..3a74349 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -46,6 +46,12 @@
{{ $t('message.workArea_Selelct') }}
+
+
+
+ {{ $t('message.delete') }}
+
+
@@ -73,11 +79,20 @@