From aa2196fc1897f78f41887e7a30bf01df6fd885c8 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Mon, 23 Sep 2024 17:01:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workSpace/workSpace.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue
index ea7df05..f9b019e 100644
--- a/pages/workSpace/workSpace.vue
+++ b/pages/workSpace/workSpace.vue
@@ -6,7 +6,7 @@
         </view>
         <h4 class="tit">业务办理</h4>
         <view class="secs">
-            <view
+         <!--   <view  重庆不需要领料申请
                 @click="jumpUrl('fetchMaterial')"
                 v-if="
                     store.includes('picking:apply:apply') ||
@@ -14,7 +14,7 @@
                 ">
                 <image src="/static/fetchMaterial.png" mode=""></image>
                 <span>领料申请</span>
-            </view>
+            </view> -->
             <view
                 @click="jumpUrl('exitMaterial')"
                 v-if="
@@ -58,12 +58,12 @@
                 companyName: "",
                 iptVal: "",
                 benchList: [
-                    {
-                        name: "领料审批",
-                        pic: "/static/fetchExam.png",
-                        url: "fetchExam",
-                        isShow: "receive:examine:fgs",
-                    },
+                    // {
+                    //     name: "领料审批",
+                    //     pic: "/static/fetchExam.png",
+                    //     url: "fetchExam",
+                    //     isShow: "receive:examine:fgs",
+                    // },
                     {
                         name: "领料审批",
                         pic: "/static/fetchExam.png",

From b82f89e8a5029d09502429ffa96e1779e4adad2e Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Thu, 26 Sep 2024 14:27:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backMaterialReceiveDetail.vue                      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
index 7b0ff26..055f7f9 100644
--- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
+++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
@@ -12,7 +12,7 @@
                     <checkbox :checked="fetch.checked" />
                 </checkbox-group>
             </view>
-            <view class="info-cont">
+            <view class="info-cont" >
                 <view>
                     <span>类型名称</span>
                     <h4>{{ fetch.typeName }}</h4>
@@ -23,9 +23,9 @@
                 </view>
                 <view>
                     <span>待退料数量</span>
-                    <h4>{{ fetch.num }}</h4>
+                    <h4>{{ fetch.maxBackNum }}</h4>
                 </view>
-                <h5 @click="openPopup(fetch)" v-if="fetch.num * 1 > 0">
+                <h5 @click="openPopup(fetch)" v-if="fetch.maxBackNum * 1 > 0">
                     点击退料
                 </h5>
             </view>
@@ -172,11 +172,11 @@
             openPopup(list) {
                 console.log(list);
                 this.infoList = list;
-                this.rfidNum = list.num;
+                this.rfidNum = list.maxBackNum;
                 this.transMaCode = list.code;
                 this.sendTypeId = list.typeId;
                 this.parentId = list.id;
-                if (Number(list.num) == 0) {
+                if (Number(list.maxBackNum) == 0) {
                     uni.showToast({
                         icon: "none",
                         title: "待退料数据为0，请勿再点击",

From 52350392b0a8ca8364ef4e8c70ea06f3ea3c6709 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Sun, 29 Sep 2024 18:23:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exitMaterialSelect/exitMaterialSelect.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/exitMaterialSelect/exitMaterialSelect.vue b/pages/exitMaterialSelect/exitMaterialSelect.vue
index b06db03..8bb69f9 100644
--- a/pages/exitMaterialSelect/exitMaterialSelect.vue
+++ b/pages/exitMaterialSelect/exitMaterialSelect.vue
@@ -68,8 +68,9 @@
                 cartList: [],
                 agreementId: "",
                 submitList: {
-                    parentId: "",
-                    backApplyDetails: "",
+                parentId: "",
+					      companyId:101,
+                backApplyDetails: "",
                 },
             };
         },
@@ -158,7 +159,9 @@
                 that.cartList = that.list.filter((item) => {
                     return item.checked == true && item.offNum > 0;
                 });
+				console.log(1111111111111);
                 console.log(that.cartList);
+				
                 if (that.cartList.length == 0) {
                     uni.showToast({
                         icon: "none",
@@ -171,7 +174,7 @@
                         confirmText: "提交",
                         success: (modalRes) => {
                             if (modalRes.confirm) {
-                                console.log(this.cartList);
+                                console.log(this.cartList)
                                 that.submitList.backApplyDetails =
                                     that.cartList.map((item) => {
                                         return {
@@ -183,6 +186,7 @@
                                             companyId: item["companyId"],
                                         };
                                     });
+								console.log(33333333333);
                                 console.log(that.submitList);
                                 // 提交退料清单
                                 that.$api.exitMaterial