bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main-cq' of http://192.168.0.56:3000/hywen/SmartStorage into main-cq

This commit is contained in:
BianLzhaoMin 2024-10-08 09:02:43 +08:00
parent 6f2a317f72 52350392b0
commit 54a2d757da
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

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

10
pages/exitMaterialSelect/exitMaterialSelect.vue
View File

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

16
pages/workSpace/workSpace.vue
View File

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