Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/i18n/lang/cn.ts

@@ -92,9 +92,11 @@ export default {
     po_DemandQuantity: '需求数量',
     DemandQuantity: '需求',
     po_ActualQuantity: '实际数量',
+    Picked:'已拣数量',
     po_ReturnGoodsQuantity: '退货数量',
     po_RemainingQuantity: '剩余数量',
     Cumulative: '累计',
+    total: '累计',
 
     //dn收货
     dn_ReceivingGoods: 'DN收货',
@@ -187,6 +189,7 @@ export default {
     Summary_SummaryAndHandover: '汇总交接',
     Summary_HandoverByOrder: '按单交接',
     Summary_Number: '可退数量',
+    Replenishment_Number: '可补数量',
     Summary_Receiver: '接收人',
     Summary_Password: '口令',
     screen: '筛选',

src/i18n/lang/en.ts

@@ -172,7 +172,9 @@ export default {
     Summary_SummaryAndHandover: 'Summary handover',
     Summary_HandoverByOrder: 'Order Handover',
     Summary_Number: 'Qty',
+    Replenishment_Number: 'Qty',
     Summary_Receiver: 'Receiver',
+    total: 'total',
     Summary_Password: 'Pwd',
     Summary_PleaseInputNumber: 'Please input Qty',
     Summary_PleaseInputReceiver: 'Please input receiver',
@@ -221,7 +223,7 @@ export default {
     RowCollectionAndBorrowing: 'RAW cost center',
 
     // 原材料盘点
-    InventoryOrderNo: 'Order No',
+    InventoryOrderNo: 'Order',
     InventoryMaterielNo: 'MAT code',
     InventoryMateriel: 'MAT name',
     InventoryTotalNumber: 'Total',
@@ -266,6 +268,7 @@ export default {
     Warehousing: 'Warehousing location',
     CommissionedGoOutDetails: 'Delivery details',
     PleaseQuantity: 'Please enter this quantity',
+    Picked:'Picked Qty',
     CommissionedGoOutNumber: 'Outbound quantity',
     // 委外-提示
     Commission_tips1: 'Please enter the order No',

src/pages/raw/handover/feeding/Location.vue

@@ -1,51 +1,85 @@
 <template>
-  <view class="page-picking-order">
+  <view class="page-raw-receipt">
     <view class="top"></view>
     <view class="header">
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <!-- <view class="title">{{ $t("message.Pi_ByOrderPicking") }}</view> -->
       <view class="title">{{ $t('message.FillingMaterials') }}</view>
       <view class="right"></view>
     </view>
-    <view class="table-wrapper">
+    <view class="content">
-      <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.blDetailList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
+      <!-- 单号 -->
-    </view>
+      <view class="single">
-    <!-- 列表展示数据 -->
+        <view class="single-left">
-    <view class="Exhibition">
+          <view>{{ $t('message.InventoryOrderNo') }}:</view>
-      <view class="Exhibition-left">
+          <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
-        <view class="Exhibition-left-title">{{ $t('message.Pi_Station') }}:</view>
+        </view>
-        <view class="Exhibition-left-data">{{ some.sendSpot }}</view>
+        <view class="single-right">
+          <u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
+        </view>
       </view>
-      <view class="Exhibition-right">
+      <!-- 物料 -->
-        <view class="Exhibition-right-title">{{ $t('message.Pi_PickedQuantity') }}:</view>
+      <view class="material">
-        <view class="Exhibition-right-data">{{ some.totalFillAmount }}</view>
+        <view class="material-left">
+          <view>{{ $t('message.CommissionedMaterielNo') }}:</view>
+          <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="some.materialCode" class="search" :options="materialList" />
+        </view>
       </view>
-    </view>
+      <view class="material">
-    <!-- 添加库位 -->
+        <view class="material-right">
-    <view class="library">
+          <view class="material-right-title">{{ $t('message.CommissionedMaterielDesc') }}:</view>
-      <view class="library-left">
+          <view class="material-right-code" style="overflow: hidden">{{ some.materialDesc }}</view>
-        <view>{{ $t('message.CommissionedLocation') }}:</view>
+        </view>
-        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
       </view>
-      <view class="library-right">
+      <view class="material">
-        <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
+        <view class="material-right">
-        <u-input v-model="qty" :type="type" :border="border" class="input" :placeholder="$t('message.Summary_PleaseInputNumber')" />
+          <view class="material-right-title">{{ $t('message.Feeding_ReplenishedQuantity') }}:</view>
+          <view class="material-right-code" style="overflow: hidden">{{ some.totalFillAmount }}</view>
+        </view>
       </view>
+      <view class="material">
+        <view class="material-right">
+          <view class="material-right-title">{{ $t('message.Replenishment_Number') }}:</view>
+          <view class="material-right-code" style="overflow: hidden">{{ some.amount }}</view>
+        </view>
+      </view>
+      <!-- 列表展示数据 -->
+      <view class="number">
+        <view class="number-left">
+          <view class="number-left-title">{{ $t('message.Pi_Station') }}:</view>
+          <u-input v-model="some.sendSpot" placeholder=" " :type="type" :border="border" class="input" disabled  style="padding:'0';"/>
+        </view>
+        <view class="number-right">
+          <view class="number-right-title">{{ $t('message.total') }}:</view>
+          <u-input placeholder=" " v-model="some.fillAmount" :type="type" :border="border" class="input" style="padding:'0';" disabled />
+        </view>
+      </view>
+      <!-- 库位 -->
+      <view class="library">
+        <view class="library-left">
+          <view>{{ $t('message.CommissionedLocation') }}:</view>
+          <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
+        </view>
+        <view class="library-right">
+          <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
+          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="qty" type="number" :border="border" class="input" />
+        </view>
+      </view>
+      <!-- 添加 -->
+      <view class="add">
+        <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
+      </view>
+      <!-- 表格 -->
+      <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="detailHeader" :contents="LocationList" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
     </view>
-    <!-- 添加 -->
-    <view class="add">
-      <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
-    </view>
-    <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="detailHeader" :contents="LocationList" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
     <view class="bottom-bar">
       <div class="extra">
         <u-form ref="form" :model="form" :error-type="['toast']">
           <u-row class="bottom-info"> </u-row>
         </u-form>
       </div>
-      <u-form ref="form2" :model="form2" :error-type="['toast']" style="background: rgb(242, 242, 242)">
+      <u-form ref="form2" :model="form2" :error-type="['toast']" style="background: rgb(255, 255, 255)">
         <u-row class="bottom-info">
           <u-col :span="6">
             <u-form-item prop="operatorPass" :label="$t('message.Summary_Receiver')" label-width="120rpx">
@@ -87,7 +121,7 @@ import model from './model';
 import { session } from '@/store/modules/session';
 import { VForm, VFormRules } from 'vue/types/form';
 import jPicker from '@/components/J-Picker/jPicker.vue';
-import { headers, detailHeader } from './config';
+import {  detailHeader } from './config';
 import { auth } from '@/store/modules/auth';
 @Component({
   components: {
@@ -110,6 +144,7 @@ export default class RawReceiptDetail extends BasePage {
    * 页面Module
    */
   model = model;
+  materialList:any = []
   type = 'text';
   wlCode: any = '';
   border = true;
@@ -126,7 +161,7 @@ export default class RawReceiptDetail extends BasePage {
    * 表单数据
    */
   form: any = {
-    // locationCode: null,
+    documentNo:'',
     amount: null,
   };
   form2 = {
@@ -144,12 +179,33 @@ export default class RawReceiptDetail extends BasePage {
    * 库存地点选择
    */
   locationCodeSelect = false;
-
-  /**
-   * 表头
-   */
-  headers = headers;
   detailHeader = detailHeader;
+  async query(){
+    if(this.form.documentNo == ''){
+      this.customToast(this.$t('message.Commission_tips1') as string);
+    }
+    await await this.model.queryBlDetailList(this.form.documentNo).then(() =>{
+      this.model.blDetailList.forEach((item:any) =>{
+        let arr = {
+          label:item.materialCode,
+          value:item.materialCode,
+        }
+        this.materialList.push(arr)
+        item.wlList = []
+      })
+      this.some = this.model.blDetailList[0];
+      this.someIndex = 0
+    })
+  }
+  materialChoice(e:any){
+    this.model.blDetailList.forEach((item:any,index:any) =>{
+      if(item.materialCode == e.pickerName.label){
+        this.some = item
+        this.someIndex = index
+      }
+    })
+    this.qty = '';
+  }
   LocationChoice(e: any) {
     this.wlCode = e.pickerName;
   }
@@ -163,13 +219,6 @@ export default class RawReceiptDetail extends BasePage {
       this.operatorName = '';
     }
   }
-  handleRow({ data }: any) {
-    this.someIndex = data[0].index;
-    this.model.blDetailList[this.someIndex].wlList = [];
-    this.some = this.model.blDetailList[this.someIndex];
-    this.qty = '';
-    console.log('this.some', this.some);
-  }
   Add() {
     if (this.qty == '' || this.wlCode == '') {
       uni.showToast({
@@ -262,6 +311,7 @@ export default class RawReceiptDetail extends BasePage {
             num += parseFloat(item.qty);
           });
           this.model.blDetailList[i].fillAmount = num;
+          console.log('this.model.blDetailList',this.model.blDetailList)
         } else if (res.cancel) {
           return;
         }
@@ -274,6 +324,8 @@ export default class RawReceiptDetail extends BasePage {
       num += parseFloat(item.qty);
     });
     this.model.blDetailList[this.someIndex].fillAmount = num;
+    this.some.fillAmount = num
+    console.log('this.model.blDetailList',this.model.blDetailList)
   }
   async onReady() {
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
@@ -314,6 +366,11 @@ export default class RawReceiptDetail extends BasePage {
     this.redirectTo(this.page.raw.handover.feeding.Local);
   }
   async onSubmit() {
+    this.model.blDetailList.forEach((item:any) =>{
+      item.wlList.forEach((item:any) =>{
+        item.wlList = null
+      })
+    })
     let dataList = this.model.blDetailList;
     const params = {
       dataList,
@@ -321,35 +378,27 @@ export default class RawReceiptDetail extends BasePage {
       factoryCode: this.session.factoryCode,
       loginName: this.session.loginName,
     };
-    await this.model.saveBlDetailUpload(params).then(() => {
+    await this.model.saveBlDetailUpload(params).then(() =>{
-      this.toPage(this.page.raw.handover.feeding.Location);
+      this.qty = '';
-    });
+      this.LocationList = []
+      this.query()
+    })
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.page-picking-order {
+.page-raw-receipt {
-  // background: #f2f2f2 linear-gradient(0deg, #311818 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
-  padding: 30rpx;
+  padding: 118rpx 30rpx 162rpx;
-  padding-left: 0;
   min-height: 100%;
-  padding-top: 118rpx;
-  padding-bottom: 222rpx;
-  .top {
-    width: 100%;
-    height: 20px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background: #4a78ea;
-  }
   .header {
     position: fixed;
     top: 36rpx;
     left: 0;
     right: 0;
+    z-index: 99;
     display: flex;
     height: 88rpx;
     line-height: 88rpx;
@@ -357,7 +406,6 @@ export default class RawReceiptDetail extends BasePage {
     font-size: 34rpx;
     font-weight: 500;
     text-align: center;
-    background: #4a78ea;
     .title {
       flex: 3;
     }
@@ -373,97 +421,154 @@ export default class RawReceiptDetail extends BasePage {
       height: 88rpx;
     }
   }
-
+  .content {
-  .table-wrapper {
-    background-color: #fff;
-    height: 500rpx;
-    overflow-x: auto;
-  }
-
-  .form {
-    background-color: #fff;
-    padding: 40rpx;
-    border-radius: 10rpx;
-  }
-  .Exhibition {
     width: 100%;
-    height: 100rpx;
+    background: white;
-    margin-top: 20rpx;
+    border-radius: 15rpx;
-    display: flex;
+    padding: 10rpx;
-    .Exhibition-left {
+    .single {
-      width: 50%;
+      width: 100%;
-      height: 100%;
+      height: 100rpx;
       display: flex;
-      .Exhibition-left-title {
+      .single-left {
-        width: 50%;
+        width: 80%;
         height: 100%;
-        text-align: center;
+        display: flex;
-        line-height: 100rpx;
+        view {
+          width: 110rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
       }
-      .Exhibition-left-data {
+      .single-right {
-        width: 50%;
+        button {
-        height: 100%;
+          margin-top: 15rpx;
-        text-align: center;
+          width: 150rpx;
-        line-height: 100rpx;
+          height: 70rpx;
+        }
       }
     }
-    .Exhibition-right {
+    .material {
-      width: 50%;
+      width: 100%;
-      height: 100%;
+      height: 100rpx;
       display: flex;
-      .Exhibition-right-title {
+      .material-left {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        view {
+          width: 100rpx;
+          line-height: 100rpx;
+        }
+        .search{
+          padding-left: 19px;
+        }
+      }
+    }
+    .material {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+      .material-right {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        .material-right-title {
+          width: 120rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
+        .material-right-code {
+          width: 80%;
+          height: 100%;
+          line-height: 100rpx;
+          text-align: left;
+          padding-left: 10px;
+          // line-height: 100rpx;
+        }
+      }
+    }
+    .number {
+      height: 100rpx;
+      display: flex;
+      .number-left {
         width: 50%;
         height: 100%;
-        // text-align: center;
+        display: flex;
-        line-height: 100rpx;
+        .number-left-title {
+          width: 120rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
+        .input {
+          width: 200rpx;
+          height: 70rpx;
+          margin-top: 15rpx;
+          margin-left: 15rpx;
+        }
       }
-      .Exhibition-right-data {
+      .number-right {
         width: 50%;
         height: 100%;
-        text-align: center;
+        display: flex;
-        line-height: 100rpx;
+        .number-right-title {
+          width: 120rpx;
+          height: 100%;
+          line-height: 100rpx;
+          text-align: center;
+        }
+        .input {
+          width: 200rpx;
+          height: 70rpx;
+          margin-top: 15rpx;
+          margin-left: 15rpx;
+        }
       }
     }
-  }
+    .library {
-  .library {
+      width: 100%;
-    width: 100%;
+      height: 100rpx;
-    height: 100rpx;
-    display: flex;
-    .library-left {
-      width: 50%;
-      height: 100%;
       display: flex;
-      view {
+      .library-left {
-        width: 230rpx;
+        width: 50%;
-        line-height: 100rpx;
-        text-align: center;
-      }
-    }
-    .library-right {
-      width: 50%;
-      height: 100%;
-      display: flex;
-      .library-right-title {
-        width: 120rpx;
         height: 100%;
-        line-height: 100rpx;
+        display: flex;
+        view {
+          width: 100rpx;
+          line-height: 100rpx;
+        }
+        .search {
+          padding-left: 19px;
+          text-align: left;
+        }
       }
-      .input {
+      .library-right {
-        width: 200rpx;
+        width: 50%;
-        height: 70rpx;
+        height: 100%;
-        margin-top: 15rpx;
+        display: flex;
-        margin-left: 15rpx;
+        .library-right-title {
+          width: 120rpx;
+          height: 100%;
+          line-height: 100rpx;
+          text-align: center;
+        }
+        .input {
+          width: 200rpx;
+          height: 70rpx;
+          margin-top: 15rpx;
+          margin-left: 15rpx;
+        }
       }
     }
-  }
+    .add {
-  .add {
+      width: 100%;
-    width: 100%;
+      height: 100rpx;
-    height: 100rpx;
+      position: relative;
-    position: relative;
+      button {
-    button {
+        position: absolute;
-      position: absolute;
+        top: 10rpx;
-      top: 10rpx;
+        right: 20rpx;
-      right: 20rpx;
+      }
     }
   }
   .bottom-bar {
@@ -475,7 +580,7 @@ export default class RawReceiptDetail extends BasePage {
 
     .container {
       background: #ffffff;
-      box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
+      // box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
       padding: 20rpx;
     }
 

src/pages/raw/handover/feeding/config.ts

@@ -5,29 +5,29 @@ import vm from '@/main';
 export const headers = [
   {
     label: vm.$t('message.po_MaterielNo'),
-    key: 'materialCode',
+    key: 'materialCode',//物料号
     width: 220,
   },
   {
     label: vm.$t('message.po_MaterielDes'),
-    key: 'materialDesc',
+    key: 'materialDesc',//物料描述
     width: 350,
   },
   {
     label: vm.$t('message.po_ActualQuantity'),
-    key: 'fillAmount',
+    key: 'fillAmount',//实际数量
   },
   {
     label: vm.$t('message.Summary_Number'),
-    key: 'amount',
+    key: 'amount',//可退数量
   },
   {
     label: vm.$t('message.Feeding_ReplenishedQuantity'),
-    key: 'totalFillAmount',
+    key: 'totalFillAmount',//已拣数量
   },
   {
     label: vm.$t('message.po_Location'),
-    key: 'locationCode',
+    key: 'locationCode',//库存地点
   },
   // {
   //   label: '工位',
@@ -66,7 +66,7 @@ export const detailHeader = [
   {
     label: vm.$t('message.po_MaterielNo'),
     key: 'materialCode',
-    width: 224,
+    width: 177,
   },
   {
     label: vm.$t('message.receiveAStation'),