From 82fdf4b73df58d83abc79a9619d12b79700f90fb Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 26 Nov 2024 10:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E5=B7=A6=E4=B8=8B=E8=A7=92=E6=B7=BB=E5=8A=A0=E3=80=90=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=90=8E=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=88=97=E5=87=BA?=
 =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=94=B3=E8=AF=B7=E5=8D=95=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E9=87=87=E8=B4=AD=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E5=87=BB=E5=85=A5=E5=BA=93=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages-order/orderList/orderList.vue               | 11 ++++++++++-
 pages-warehouse/inOutWarehouse/inOutWarehouse.vue |  6 ++++++
 pages-warehouse/inOutWarehouse/part.vue           |  4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pages-order/orderList/orderList.vue b/pages-order/orderList/orderList.vue
index 9e6b5e2..b46882e 100644
--- a/pages-order/orderList/orderList.vue
+++ b/pages-order/orderList/orderList.vue
@@ -121,9 +121,15 @@ export default {
       cusFromValueList:[''],
       // 客户来源选中下标
       cusFromIndex:0,
+      twId: null,
     }
   },
-  onLoad(){
+  onLoad(data){
+    if (data && data.twId){
+      this.twId = data.twId
+    }else {
+      this.twId = null
+    }
     if(!getToken()){
       uni.reLaunch({
         url: '/pages/login/login'
@@ -372,6 +378,9 @@ export default {
         userId: this.userInfo.id,
         soType: "01"
       }
+      if (this.twId){
+        paramsObj.twId = this.twId
+      }
       request({
         url: '/admin-api/repair/so/page',
         method: 'get',
diff --git a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
index 98f3001..6c8f43a 100644
--- a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
+++ b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
@@ -50,6 +50,7 @@
       <text class="label"></text>
       <text class="repairNum"></text>
       <view class="submit" @click="toPart">采购</view>
+      <view class="submit" @click="toInWares">入库单</view>
       <view class="submit" @click="submitBefore">{{ isReceive ? '通知领料' : '通知退料' }}</view>
     </view>
 
@@ -122,6 +123,11 @@ export default {
 
   computed: {},
   methods: {
+    toInWares(){
+      uni.navigateTo({
+        url: '/pages-order/orderList/orderList?twId=' + this.twId
+      })
+    },
     async submitBefore(){
       if (!this.selectRows || this.selectRows.length === 0){
         uni.showToast({
diff --git a/pages-warehouse/inOutWarehouse/part.vue b/pages-warehouse/inOutWarehouse/part.vue
index 0971f87..889de05 100644
--- a/pages-warehouse/inOutWarehouse/part.vue
+++ b/pages-warehouse/inOutWarehouse/part.vue
@@ -166,6 +166,7 @@ export default {
       if (getJSONData("applyWaresForm")) {
         this.formData = getJSONData("applyWaresForm")
         this.wares = this.formData.items
+        this.twId = this.formData.id
         this.init()
       }
     }
@@ -387,6 +388,9 @@ export default {
         }
       })]
       data.waresList = [...values.map(item => item.wares)]
+      if (this.twId){
+        data.twId = this.twId
+      }
       request({
         url: '/admin-api/repair/so/create',
         method: 'post',