licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序添加扫码

Browse Source
This commit is contained in:
Ledo 2025-07-10 09:22:13 +08:00
parent 7bb9f39f49
commit 8d8f917e44
4 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue
View File

@ -79,17 +79,20 @@
historyList.value = data.list historyList.value = data.list
isShowEnd.value = true; isShowEnd.value = true;
isShowStart.value = true isShowStart.value = true
if (historyList.value.length) { if (historyList.value.length) {
const obj = historyList.value[0] const obj = historyList.value[0]
console.log('s') if (obj.amount !=null && obj.amount >= 0 ) {
if (!obj?.amount) { isShowStart.value = true
isShowStart.value = false }else{
isShowStart.value = false
} }
} }
if (historyList.value.length) { if (historyList.value.length) {
const obj = historyList.value[0] const obj = historyList.value[0]
if (obj?.amount) { if (obj.amount !=null && obj.amount >= 0 ) {
isShowEnd.value = false isShowEnd.value = false
}else{
isShowEnd.value = true
} }
} else { } else {
isShowEnd.value = false isShowEnd.value = false

18
mes-ui/mini-app/src/pages/assembleReport/components/dataItem.vue
View File

@ -86,15 +86,15 @@ onShow(async () => {
}) })
const handleDetail = async(item) => { const handleDetail = async(item) => {
var isoverBefore= await isOverBeforeProcedure(item.id); // var isoverBefore= await isOverBeforeProcedure(item.id);
if(isoverBefore == true){ // if(isoverBefore == true){
uni.showToast({ // uni.showToast({
title: '上一道工序尚未完成报工！', // title: '上一道工序尚未完成报工！',
icon: 'none', // icon: 'none',
duration: 2000, // duration: 2000,
}) // })
return // return
} // }
const url = `/pages/assembleReport/assembleReport-detail?id=${item.id}` const url = `/pages/assembleReport/assembleReport-detail?id=${item.id}`
uni.navigateTo({ url }) uni.navigateTo({ url })
} }

18
mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue
View File

@ -105,15 +105,15 @@ onShow(async () => {
}); });
const handleDetail = async (item) => { const handleDetail = async (item) => {
var isoverBefore = await isOverBeforeProcedure(item.id); // var isoverBefore = await isOverBeforeProcedure(item.id);
if (isoverBefore == true) { // if (isoverBefore == true) {
uni.showToast({ // uni.showToast({
title: noticeMsg.value, // title: noticeMsg.value,
icon: "none", // icon: "none",
duration: 2000, // duration: 2000,
}); // });
return; // return;
} // }
const url = `/pages/productionReport/productionReport-detail?id=${item.id}`; const url = `/pages/productionReport/productionReport-detail?id=${item.id}`;
uni.navigateTo({ url }); uni.navigateTo({ url });
}; };

10
mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
View File

@ -84,14 +84,18 @@
isShowStart.value = true isShowStart.value = true
if (historyList.value.length) { if (historyList.value.length) {
const obj = historyList.value[0] const obj = historyList.value[0]
if (!obj?.amount) { if (obj.amount !=null && obj.amount >= 0 ) {
isShowStart.value = false isShowStart.value = true
}else{
isShowStart.value = false
} }
} }
if (historyList.value.length) { if (historyList.value.length) {
const obj = historyList.value[0] const obj = historyList.value[0]
if (obj?.amount) { if (obj.amount !=null && obj.amount >= 0 ) {
isShowEnd.value = false isShowEnd.value = false
}else{
isShowEnd.value = true
} }
} else { } else {
isShowEnd.value = false isShowEnd.value = false