From aaf9056bd05ec23693ae7b74c402391bf0f11be7 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 10 Jul 2024 16:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/J-Picker/jPicker.vue   | 15 ++++++++++-----
 src/pages/login/login/index.vue       |  2 +-
 src/pages/wms/Raw/ReceivePO/index.vue | 12 +++++-------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/J-Picker/jPicker.vue b/src/components/J-Picker/jPicker.vue
index 4d85892..e05a6d9 100644
--- a/src/components/J-Picker/jPicker.vue
+++ b/src/components/J-Picker/jPicker.vue
@@ -32,7 +32,11 @@
         <picker-view :value="[nSel]" class="pickerView" :mask-style="'background-color:' + bgColor" :indicator-style="selStyle" @change="selChange">
           <picker-view-column>
             <view class="opItem" v-for="(item, index) in listData" :key="index">
-              <view style="color:#9b1f1f;text-align:left" v-if="showCode">{{ delzero(item[valKey])|| item}}</view>
+              <view style="color: #9b1f1f; text-align: left">
+                <span v-if="showCode">物料:{{ delzero(item[valKey]) || item }}</span>
+                <span v-if="duoyukey"><span>&nbsp;&nbsp;&nbsp;&nbsp;</span>采购单:{{ item[duoyukey] }}</span>
+              </view>
+
               <view>{{ item[showKey] || item }}</view>
             </view>
           </picker-view-column>
@@ -47,12 +51,13 @@
  * 选择组件
  * @property {Array} options 选择数组
  * @property {String} showKey 显示的对象键名
+ * @property {String} duoyukey 取值的对象键名
  * @property {String} val 默认选中下标
  * @property {String} valKey 取值的对象键名
  * @property {Boolean} disabled 是否只读
  * * @property {String} moren 是否只读
  * @property {Boolean} showCode 是否在选项中增加code显示,且是处理后的，去掉物料编码中前面的几个零
- * 
+ *
  * @event {Function} position 搜索框位置
  * @event {Function} sure 确认事件
  * @example <jPicker :disabled="false" class="cont" @sure="bindPickerChange($event,'TYPE')" showKey="Name" valKey="Value" :val="CurrentType" :options="FilterArray" />
@@ -73,7 +78,7 @@ export default {
       keyWord: '',
     };
   },
-  props: ['options', 'moren', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus', 'showCode'],
+  props: ['options', 'moren', 'showKey', 'duoyukey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus', 'showCode'],
   //选项数组，列表显示的对象键名，取值的对象键名,默认选中值,搜索框位置,是否禁用,整体背景色,确认键颜色
   watch: {
     options(n) {
@@ -105,7 +110,7 @@ export default {
     }
   },
   methods: {
-    delzero(item){
+    delzero(item) {
       return item.slice(item.search(/[1-9]/));
     },
     showPicker() {
@@ -360,7 +365,7 @@ export default {
       color: #000000;
       display: flex;
       flex-direction: column;
-      justify-content:space-around;
+      justify-content: space-around;
     }
   }
 }
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index d41c9c7..8ea565a 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.77'; //正式版本号
+  version = '0.0.78'; //正式版本号
   //version = '0.0.4'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index 781cbfe..ba8f138 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -12,7 +12,7 @@
       <view class="single">
         <view class="single-left">
           <view>送货单号:</view>
-          <u-search placeholder="请扫描" v-model="userDefined5" :show-action="false"></u-search>
+          <u-search placeholder="请扫描" v-model="userDefined5" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="tidandelivery">提单</u-button>
@@ -31,7 +31,7 @@
       <!-- 订单 -->
       <u-form-item label="物料描述">
         <!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
-        <jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
+        <jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
       </u-form-item>
       <view class="creatshow">
         <u-button class="buttonshow" type="primary" @click="generate">生成收货单号</u-button>
@@ -452,6 +452,7 @@ export default class receivePO extends BasePage {
     if (this.materilist.length) {
       this.aimWl = this.materilist[0];
       this.list.push(this.materilist[0]);
+      this.procureCode = this.list[0].procureCode;
     } else {
       this.aimWl = {} as OptionType;
     }
@@ -594,11 +595,8 @@ export default class receivePO extends BasePage {
   bookTypeChange(e: any) {
     this.aimWl = e.pickerName;
     this.list = [];
-    this.materilist.forEach((item) => {
-      if (e.pickerName.value == item.materialCode) {
-        this.list.push(item);
-      }
-    });
+    this.list.push(e.pickerName);
+    this.procureCode = this.list[0].procureCode;
     //
     //this.queryinformation();
     //this.getlist();