重构 领用借用

src/i18n/lang/cn.ts

@@ -197,8 +197,10 @@ export default {
     return_Tip4: '退料数量不能大于总数',
     quantitys: '不能大于应退货数量',
     actual: '实际退货数量不等于应退货数量',
+    Requisition: '领用单',
     greater: '不能大于总数',
     receiveAStation: '接收工位',
+    collecting: '请输入领用单号',
 
     //库内主菜单
     Warehouse: '成品库内',

src/i18n/lang/en.ts

@@ -216,6 +216,7 @@ export default {
     InventoryTotalNumber: 'Total',
     InventoryPleaseScan: 'Please scan No.',
     InventoryFinish: 'Finish',
+    collecting: 'Please enter the collecting doc No',
 
     // 委外-入库
     CommissionEntrant: 'Subcontracting receipt',
@@ -224,6 +225,7 @@ export default {
     CommissionedMaterielDesc: 'describe',
     SourceLocation: 'Source location',
     barcode: 'Please enter barcode',
+    Requisition: 'Requisition',
     scrapForm: 'Please scan the scrap form first',
     finishedProduct: 'Please select finished product code first',
     CommissionedDemandData: 'Demand',

src/pages/product/warehouse/wholeCollect/index.vue

@@ -8,37 +8,50 @@
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <!-- 条码 -->
+      <!-- 领用单 -->
-      <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
+      <view class="single">
-        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="model.getProductCode" :show-action="false"></u-search>
+        <view class="single-left">
-      </u-form-item>
+          <view>{{ $t('message.Requisition') }}</view>
+          <u-search :placeholder="$t('message.collecting')" v-model="form.order3" @search="query" :show-action="false"></u-search>
+        </view>
+        <view class="single-right">
+          <u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
+        </view>
+      </view>
       <!-- 成品编码 -->
       <u-form-item :label="$t('message.product_FGCode')">
-        <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
+        <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="wl.value" class="search" :options="model.choiceCodeList" />
       </u-form-item>
       <!-- 成品描述 -->
       <u-form-item :label="$t('message.product_FGDes')">
-        <u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" />
+        <u-input :disabled="true" v-model="Some.productDescZh" placeholder="" />
       </u-form-item>
       <!-- 数量 -->
       <u-form-item :label="$t('message.product_Number')">
-        <u-input :disabled="true" v-model="model.orderInInfo.qty" placeholder="" />
+        <u-input :disabled="true" v-model="Some.qty" placeholder="" />
       </u-form-item>
-      <!-- 库位 -->
+      <!-- 源库位 -->
-      <u-form-item :label="$t('message.product_Location')">
+      <u-form-item :label="$t('message.SourceLocation')">
-        <u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
+        <u-input :disabled="true" v-model="Some.originWl" placeholder="" />
       </u-form-item>
       <!-- 成本中心 -->
       <u-form-item :required="true" :label="$t('message.product_costCenter')">
-        <u-input v-model="model.orderInInfo.costCenter" :placeholder="$t('message.po_PleaseInput')" />
+        <u-input v-model="Some.costCenter" :placeholder="$t('message.po_PleaseInput')" />
+      </u-form-item>
+      <!-- 条码 -->
+      <u-form-item :label="$t('message.product_BarCode')">
+        <u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
       <u-row class="button-bar">
-        <u-col :span="6">
+        <u-col :span="4">
-          <u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
+          <u-button type="primary" @click="onSubmit">{{ $t('message.detailed') }}</u-button>
         </u-col>
-        <u-col :span="6">
+        <u-col :span="4">
+          <u-button type="primary" @click="onSubmit">{{ $t('message.InventoryFinish') }}</u-button>
+        </u-col>
+        <u-col :span="4">
           <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
@@ -50,33 +63,27 @@ import { Component, Ref } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import { VForm, VFormRules } from 'vue/types/form';
 import model from './model';
+import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
 interface OptionType {
   label: string;
   value: string;
 }
-@Component
+@Component({
+  components: {
+    jPicker,
+  },
+})
 export default class ProductCheckReceipt extends BasePage {
   @Ref('form') readonly $form!: VForm;
   model = model;
   //表单
   form = {
-    ...this.model.orderInInfo,
+    order3: '',
-    originWl: {} as OptionType,
+    barcode: '',
-    aimWl: {} as OptionType,
-    qty: {} as OptionType,
   };
-  originWlSelect = false;
+  wl: any = {};
-  aimWlSelect = false;
+  Some: any = {};
-  cboPlaceSelect = false;
-  rules: VFormRules<any> = {
-    documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
-    originWl: [{ required: true, message: this.$t('message.Warehouse_Tip2') as string }],
-    aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
-    cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
-  };
-  value = '';
-  show = false;
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   onReady() {
     this.model.orderInInfo.productDescZh = '';
@@ -84,49 +91,107 @@ export default class ProductCheckReceipt extends BasePage {
     this.model.orderInInfo.qty = '';
     this.model.orderInInfo.locCode = '';
     this.model.orderInInfo.costCenter = '';
-    this.$form.setRules(this.rules);
-    this.model.queryLocation();
   }
-  onSubmit() {
+  //单号查询
-    this.$form.validate((valid: boolean) => {
+  async query() {
-      if (!valid) return;
+    if (!this.form.order3) {
-      if (!this.form.productCode) {
+      uni.showToast({
-        uni.showToast({
+        icon: 'none',
-          icon: 'none',
+        title: this.$t('message.Commission_tips1') as string,
-          title: this.$t('message.Warehouse_Tip5') as string,
+      });
-        });
+      return;
-        return;
+    }
+    let param = {
+      factoryCode: session.factoryCode,
+      loginName: session.loginName,
+      order3: this.form.order3,
+      orderType: 'LY',
+      page: '1',
+      rows: '50',
+    };
+    await this.model.queryScrapList(param);
+    if (this.model.code == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.product_Tip8') as string,
+      });
+      this.wl.value = this.model.choiceCodeList[0].value;
+      this.Some = this.model.recordsList[0];
+    }
+  }
+  //选择成品编码
+  materialChoice(e: any) {
+    this.wl = e.pickerName;
+    this.model.recordsList.forEach((item: any) => {
+      if (item.productCode == e.pickerName.value) {
+        this.Some = item;
       }
-      if (!this.model.orderInInfo.costCenter) {
-        uni.showToast({
-          icon: 'none',
-          title: this.$t('message.Warehouse_Tip8') as string,
-        });
-        return;
-      }
-      console.log('orderlist');
-      const orderlist = [
-        {
-          ...this.model.orderInInfo,
-          // originWl: this.form.originWl.value,
-          originWl: this.model.orderInInfo.locCode,
-          // aimWl: this.form.aimWl.value, custcode
-          type: '0',
-          orderType: '2',
-          keepBy: session.loginName,
-          factoryCode: session.factoryCode,
-        },
-      ];
-      console.log('orderlist', orderlist);
-      this.model.onTakeoutConfirm(orderlist);
-      this.model.orderInInfo.productDescZh = '';
-      this.model.orderInInfo.productCode = '';
-      this.model.orderInInfo.qty = '';
-      this.model.orderInInfo.locCode = '';
-      this.model.orderInInfo.costCenter = '';
-      this.form.productCode = '';
     });
   }
+  //条码扫码
+  async scanning() {
+    if (!this.form.order3) {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.scrapForm') as string,
+      });
+    }
+    if (!this.Some) {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.finishedProduct') as string,
+      });
+    }
+    if (!this.form.barcode) {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.barcode') as string,
+      });
+      return;
+    }
+    let params = {
+      factoryCode: session.factoryCode,
+      loginName: session.loginName,
+      barcode: this.form.barcode,
+      productCode: this.wl.value,
+      locCode: this.Some.originWl,
+    };
+    await this.model.getProductCode(params);
+    if (this.model.code == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.product_Tip8') as string,
+      });
+    }
+  }
+  //确定
+  async onSubmit() {
+    const orderlist = [
+      {
+        ...this.model.orderInInfo,
+        originWl: this.Some.originWl,
+        barCode: this.form.barcode,
+        aimWl: this.Some.aimWl,
+        type: '0',
+        orderType: '2',
+        keepBy: session.loginName as string,
+        factoryCode: session.factoryCode as string,
+        order3: this.form.order3,
+        costCenter: this.Some.costCenter,
+      },
+    ];
+    await this.model.onTakeoutConfirm(orderlist);
+    if (this.model.code == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.success') as string,
+      });
+    }
+    this.Some = {};
+    this.wl = {};
+    this.form.order3 = '';
+    this.form.barcode = '';
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -175,6 +240,28 @@ export default class ProductCheckReceipt extends BasePage {
       padding: 30rpx 0;
       line-height: 35rpx;
     }
+    .single {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+      .single-left {
+        width: 80%;
+        height: 100%;
+        display: flex;
+        view {
+          width: 110rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
+      }
+      .single-right {
+        button {
+          margin-top: 15rpx;
+          width: 150rpx;
+          height: 70rpx;
+        }
+      }
+    }
   }
 
   .bottom-bar {

src/pages/product/warehouse/wholeCollect/model.ts

@@ -27,7 +27,9 @@ export class wholeCollect extends VuexModule {
    * 库位地点列表
    */
   WlList = [];
-
+  code: any = '';
+  recordsList: any = [];
+  choiceCodeList: any = [];
   /**
    * 物料型号类型
    */
@@ -77,40 +79,39 @@ export class wholeCollect extends VuexModule {
     return { WlList };
   }
 
+  @MutationAction
+  async queryScrapList(param: any) {
+    const res: any = await http.post(url.warehouse.rowTransfer.list, param);
+    const code = res.code;
+    console.log('res', res);
+    const recordsList = res.data.records;
+    const choiceCodeList = [];
+    recordsList.forEach((item: any) => {
+      let arr: any = {};
+      arr.label = item.productCode;
+      arr.value = item.productCode;
+      choiceCodeList.push(arr);
+    });
+    console.log('choiceCodeList', choiceCodeList);
+    return { code, recordsList, choiceCodeList };
+  }
   /**
    * 查询单号
    * 查询DN单号
    * @param dnNo
    */
   @MutationAction
-  async getProductCode(barcode: string) {
+  async getProductCode(params: any) {
-    const res: any = await http.post(url.warehouse.wholeTransfer.content, {
+    const res: any = await http.post(url.warehouse.wholeTransfer.content, params);
-      barcode,
+    const orderInInfo = res.data.records[0];
-      factoryCode: session.factoryCode,
+    const code = res.code;
-      loginName: session.loginName,
+    return { code, orderInInfo };
-    });
-    console.log('获取来的数据', res.data.records);
-    const orderInInfo = res.data.records[0] || {};
-    if (orderInInfo.custCode == '0') {
-      orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any;
-    } else if (orderInInfo.custCode == '1') {
-      orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any;
-    } else if (orderInInfo.custCode == '2') {
-      orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any;
-    } else if (orderInInfo.custCode == '4') {
-      orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any;
-    }
-    return { orderInInfo };
   }
-
   @MutationAction
   async onTakeoutConfirm(list: any[]) {
     const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
-    if (records.code == 1) {
+    const code = records.code;
-      uni.showToast({ icon: 'success', title: 'success' });
+    return { code };
-      // uni.navigateTo({ url: page.product.warehouse.index });
-    }
-    return {};
   }
   // /**
   //  * 提交看单明细

src/pages/product/warehouse/wholeScrap/index.vue

@@ -82,19 +82,8 @@ interface OptionType {
   },
 })
 export default class productCheckReceipt extends BasePage {
-  /**
-   * 表单引用
-   */
   @Ref('form') readonly $form!: VForm;
-
-  /**
-   * 页面Module
-   */
   model = model;
-
-  /**
-   * 表单数据
-   */
   form = {
     productCode: '',
     order3: '',
@@ -102,6 +91,7 @@ export default class productCheckReceipt extends BasePage {
   };
   wl: any = {};
   Some: any = {};
+  //选择成品编码
   materialChoice(e: any) {
     this.wl = e.pickerName;
     this.model.recordsList.forEach((item: any) => {
@@ -110,6 +100,7 @@ export default class productCheckReceipt extends BasePage {
       }
     });
   }
+  //条码扫码
   async scanning() {
     if (!this.form.order3) {
       uni.showToast({
@@ -145,16 +136,7 @@ export default class productCheckReceipt extends BasePage {
       });
     }
   }
-  rules: VFormRules<any> = {
-    documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
-    // originWl: [{ required: true, message: '请选择库位地点' }],
-    aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
-    cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
-  };
-
   value = '';
-  show = false;
-
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   onReady() {
     this.model.orderInInfo.productDescZh = '';
@@ -162,8 +144,8 @@ export default class productCheckReceipt extends BasePage {
     this.model.orderInInfo.qty = '';
     this.model.orderInInfo.locCode = '';
     this.model.orderInInfo.costCenter = '';
-    this.$form.setRules(this.rules);
   }
+  //单号查询
   async query() {
     if (!this.form.order3) {
       uni.showToast({
@@ -190,35 +172,33 @@ export default class productCheckReceipt extends BasePage {
       this.Some = this.model.recordsList[0];
     }
   }
-  onSubmit() {
+  //确定
-    this.$form.validate(async (valid: boolean) => {
+  async onSubmit() {
-      if (!valid) return;
+    const orderlist = [
-      const orderlist = [
+      {
-        {
+        ...this.model.orderInInfo,
-          ...this.model.orderInInfo,
+        originWl: this.Some.originWl,
-          originWl: this.Some.originWl,
+        barCode: this.form.barcode,
-          barCode: this.form.barcode,
+        aimWl: this.Some.aimWl,
-          aimWl: this.Some.aimWl,
+        type: '0',
-          type: '0',
+        orderType: '1',
-          orderType: '1',
+        keepBy: session.loginName as string,
-          keepBy: session.loginName as string,
+        factoryCode: session.factoryCode as string,
-          factoryCode: session.factoryCode as string,
+        order3: this.form.order3,
-          order3: this.form.order3,
+        costCenter: this.Some.costCenter,
-          costCenter: this.Some.costCenter,
+      },
-        },
+    ];
-      ];
+    await this.model.onTakeoutConfirm(orderlist);
-      await this.model.onTakeoutConfirm(orderlist);
+    if (this.model.code == '1') {
-      if (this.model.code == '1') {
+      uni.showToast({
-        uni.showToast({
+        icon: 'none',
-          icon: 'none',
+        title: this.$t('message.success') as string,
-          title: this.$t('message.success') as string,
+      });
-        });
+    }
-      }
+    this.Some = {};
-      this.Some = {};
+    this.wl = {};
-      this.wl = {};
+    this.form.order3 = '';
-      this.form.order3 = '';
+    this.form.barcode = '';
-      this.form.barcode = '';
-    });
   }
 }
 </script>
@@ -303,8 +283,5 @@ export default class productCheckReceipt extends BasePage {
     box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
     padding: 20rpx;
   }
-
-  .button-bar {
-  }
 }
 </style>