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 @@
-
+
类型名称
{{ fetch.typeName }}
@@ -23,9 +23,9 @@
待退料数量
- {{ fetch.num }}
+ {{ fetch.maxBackNum }}
-
+
点击退料
@@ -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,请勿再点击",
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
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 @@
业务办理
-
领料申请
-
+ -->