cosmoim-852 fix 拣配交接虚拟交接增加根据目标库位查询

3 years ago · 8fabc037fa
parent aed2664a89
commit 8fabc037fa
3 changed files with 109 additions and 10 deletions
--- a/src/pages/raw/handover/RUS-picking/index.vue
+++ b/src/pages/raw/handover/RUS-picking/index.vue
@ -32,6 +32,10 @@
            <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
            <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
          </view>
+          <u-form-item :label="$t('message.target')" prop="Category">
+            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="formone.aimWl.value" :options="CategoryList" />
+            <u-button @click="ondelete" type="primary">{{ $t('message.delete') }}</u-button>
+          </u-form-item>
        </u-col>
        <u-col :span="12">
          <view class="table-wrapper">
@ -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' },
+    ];
+  }
 }
 </script>

--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@ -46,6 +46,12 @@
            <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
          </view>
        </u-col>
+        <u-col :span="12">
+          <u-form-item :label="$t('message.target')" prop="Category">
+            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="formone.aimWl.value" :options="CategoryList" />
+            <u-button @click="ondelete" type="primary">{{ $t('message.delete') }}</u-button>
+          </u-form-item>
+        </u-col>
      </u-row>
      <u-row>
        <u-col :span="12">
@ -73,11 +79,20 @@
 <script lang="ts">
 import { Component, Ref, Watch } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
+import jPicker from '@/components/J-Picker/jPicker.vue';
 import { VForm } from 'vue/types/form';
 import model from './model';
 import { headers } from './config';
 import { session } from '@/store/modules/session';
-@Component
+interface OptionType {
+  label: string;
+  value: string;
+}
+@Component({
+  components: {
+    jPicker,
+  },
+})
 export default class Aggregating extends BasePage {
  /**
   * 表单引用
@ -92,6 +107,9 @@ export default class Aggregating extends BasePage {
   */
  model = model;
  border = true;
+  formone = {
+    aimWl: {} as OptionType,
+  };
  /**
   * 表头
   */
@ -121,6 +139,11 @@ export default class Aggregating extends BasePage {
    minute: false,
    second: false,
  };
+  CategoryList = [
+    { lable: 'L1CA', value: 'L1CA' },
+    { lable: 'L1DA', value: 'L1DA' },
+    { lable: 'L1FA', value: 'L1FA' },
+  ];
  /**
   * 表单是否改变
   */
@ -185,6 +208,10 @@ export default class Aggregating extends BasePage {
    this.form.sapFactoryCode = session.factoryCode;
    //this.form.requestTime = this.getNowFormatDate();
  }
+  bookTypeChange(e: any) {
+    console.log('///', e);
+    this.formone.aimWl = e.pickerName;
+  }
  // getNowFormatDate() {
  //   var date = new Date();
  //   var seperator1 = '-';
@ -203,6 +230,14 @@ export default class Aggregating extends BasePage {
  startConfirm(startParams: any) {
    this.form.requestTime = startParams.year + '-' + startParams.month + '-' + startParams.day;
  }
+  ondelete() {
+    this.formone.aimWl.value = '';
+    this.CategoryList = [
+      { lable: 'L1CA', value: 'L1CA' },
+      { lable: 'L1DA', value: 'L1DA' },
+      { lable: 'L1FA', value: 'L1FA' },
+    ];
+  }
  /**
   * 确认
   */
@ -242,7 +277,7 @@ export default class Aggregating extends BasePage {
  async 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.isFormChange = false;
      this.model.isFormChange = this.formParams;
    });
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@ -38,6 +38,12 @@
            <u-input v-model="form.materialCodeList" :border="border" :placeholder="$t('message.po_PleaseInput')" />
          </u-form-item>
        </u-col>
+        <u-col :span="12">
+          <u-form-item :label="$t('message.target')" prop="Category">
+            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="formone.aimWl.value" :options="CategoryList" />
+            <u-button @click="ondelete" type="primary">{{ $t('message.delete') }}</u-button>
+          </u-form-item>
+        </u-col>
        <!-- 表 -->
        <u-col :span="12">
          <view class="table-wrapper">
@ -65,12 +71,20 @@
 <script lang="ts">
 import { Component, Ref, Watch } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
+import jPicker from '@/components/J-Picker/jPicker.vue';
 import { VForm } from 'vue/types/form';
 import model from './model';
 import { headers } from './config';
 import { session } from '@/store/modules/session';
-
-@Component
+interface OptionType {
+  label: string;
+  value: string;
+}
+@Component({
+  components: {
+    jPicker,
+  },
+})
 export default class Virtual extends BasePage {
  /**
   * 表单引用
@ -91,7 +105,9 @@ export default class Virtual extends BasePage {
   * 表头
   */
  headers = headers;
-
+  formone = {
+    aimWl: {} as OptionType,
+  };
  /**
   * 表单数据
   */
@ -107,6 +123,11 @@ export default class Virtual extends BasePage {
    materialCodeList: '',
    sendSpotList: '',
  };
+  CategoryList = [
+    { lable: 'L1CA', value: 'L1CA' },
+    { lable: 'L1DA', value: 'L1DA' },
+    { lable: 'L1FA', value: 'L1FA' },
+  ];

  /**
   * 表单是否改变
@ -170,7 +191,10 @@ export default class Virtual extends BasePage {
    model.clearProOrderList();
    this.form.sapFactoryCode = session.factoryCode;
  }
-
+  bookTypeChange(e: any) {
+    console.log('///', e);
+    this.formone.aimWl = e.pickerName;
+  }
  /**
   * 确认
   */
@ -212,10 +236,18 @@ export default class Virtual extends BasePage {
  onQuery() {
    this.$form.validate(async (valid: boolean) => {
      if (!valid) return;
-      this.model.queryProOrder(this.formParams);
+      this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
      this.isFormChange = false;
    });
  }
+  ondelete() {
+    this.formone.aimWl.value = '';
+    this.CategoryList = [
+      { lable: 'L1CA', value: 'L1CA' },
+      { lable: 'L1DA', value: 'L1DA' },
+      { lable: 'L1FA', value: 'L1FA' },
+    ];
+  }
 }
 </script>