Merge remote-tracking branch 'lanju/master' into lanju

src/pages/wms/Raw/ArrivalRegistrationPO/index.vue

@@ -60,6 +60,10 @@
               <view class="list-item"> 应收/已收: </view>
               <view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
             </view>
+            <view class="row-list">
+              <view class="list-item"> 供应商: </view>
+              <view>{{ item.supplierName }}/{{ item.supplierCode }}</view>
+            </view>
             <!-- <view a:if="true" class="righttitle">
               <view @click.stop="onPass(item)" class="boder-icon-rigth"> 收货 </view>
             </view> -->

src/pages/wms/Raw/ReceivePO/index.vue

@@ -36,6 +36,9 @@
         {{ waCodeList && waCodeList.warehouseName }}
         <!-- <jPicker sureColor="#ff0000" :moren="moren1" @bindpicker="selectProductwaCode" showKey="label" valKey="value" :val="waCodeTypeList.value" :options="waCodeList" /> -->
       </u-form-item>
+      <u-form-item label="供应商">
+        <view v-if="bimWl.supplierName"> {{ bimWl.supplierName }}({{ bimWl.supplierCode }}) </view>
+      </u-form-item>
       <u-form-item label="标志卡">
         <u-search placeholder="请扫描" :focus="twofouces" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
       </u-form-item>

src/pages/wms/Raw/ReceiveSRM/index.vue

@@ -72,7 +72,7 @@
     </view>
 
     <view class="scroll">
-      <view @click="editornumber(item)" v-for="item in receivedlist" :key="item.id">
+      <view @click="editornumber(item)" v-for="item in filterReceivedList" :key="item.id">
         <u-form style="margin-top: 10rpx" class="form2">
           <view class="list">
             <view class="righttitle">
@@ -160,6 +160,7 @@ import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import model from './model';
 import { session } from '@/store/modules/session';
+import { removeLeadingZeros } from '@/utils/tool';
 
 interface OptionType {
   label: string;
@@ -175,6 +176,7 @@ export default class receiveSRM extends BasePage {
   list: any = [];
   realityaddNumber = 0;
   receivedlist: any = [];
+  filterReceivedList: any = [];
   operationNumber = 0;
   nooperationNumber = 0;
   czNumber = '';
@@ -318,6 +320,7 @@ export default class receiveSRM extends BasePage {
     await this.model.selectCardList(params);
     if (this.model.rfidreturncode == '200') {
       this.receivedlist = this.model.rfiddata;
+      this.filterReceivedList = this.handelFilterReceivedList(this.model.rfiddata);
     }
   }
   editornumber(item) {
@@ -353,6 +356,7 @@ export default class receiveSRM extends BasePage {
   selectProductCodeType(e) {
     console.log(e);
     this.bimWl = e.pickerName;
+    this.filterReceivedList = this.handelFilterReceivedList(this.receivedlist);
     this.list = this.oldprodlist.filter((item) => {
       return item.handlematerialCode == this.bimWl.value;
     });
@@ -404,6 +408,11 @@ export default class receiveSRM extends BasePage {
       this.query();
     }
   }
+  handelFilterReceivedList(list: any) {
+    return list.filter((item) => {
+      return removeLeadingZeros(item.materialCode) == this.bimWl.value;
+    });
+  }
 }
 </script>
 <style lang="scss" scoped>