diff --git a/src/pages/mes/workScheduling/waitQuality.vue b/src/pages/mes/workScheduling/waitQuality.vue
index fe9b549..e0cb35f 100644
--- a/src/pages/mes/workScheduling/waitQuality.vue
+++ b/src/pages/mes/workScheduling/waitQuality.vue
@@ -17,11 +17,17 @@
合格数量：
-
+
+
+
+
不合格数量：
-
+
+
+
+
不合格原因：
@@ -69,6 +75,7 @@
planDayCode:'PO20240430-0011',
processCode:'QD_CY_01'
})
+ const planCount = ref(100)
const saveData = ref({
id:'0',
planDayCode:'',
@@ -100,6 +107,9 @@
})
}
+ function valChange(){
+ saveData.value.unqualified = planCount.value - saveData.value.qualified
+ }
// 选择人员回调函数
function confirmSelectWorker(val){
if(!saveData.value.personSelected.includes(val[0].value)){
@@ -128,6 +138,8 @@
saveData.value.processCode = paramData.value.nodeCode
saveData.value.planDayCode = paramData.value.planNoDay
saveData.value.id = paramData.value.id
+ planCount.value = paramData.value.planCount
+ saveData.value.qualified = paramData.value.planCount
}
})
onShow(() => {
diff --git a/src/pages/mes/workScheduling/waitReport.vue b/src/pages/mes/workScheduling/waitReport.vue
index 6e55fb2..871165a 100644
--- a/src/pages/mes/workScheduling/waitReport.vue
+++ b/src/pages/mes/workScheduling/waitReport.vue
@@ -13,11 +13,17 @@
报工数量：
-
+
+
+
+
报工工时：
-
+
+
+
+
是否质检：
@@ -27,11 +33,17 @@
合格数量：
-
+
+
+
+
不合格数量：
-
+
+
+
+
@@ -85,6 +97,7 @@
reportPersonName:'',
workTerm:''
})
+ const planCount = ref(100)
const saveData = ref({
processCode:'',
reportDate:'',
@@ -94,11 +107,12 @@
function changeStatus(){
if(formData.value.checkFlag){
+ formData.value.qualified = formData.value.reportCount
}
else
{
- formData.value.qualified = ''
- formData.value.unqualified = ''
+ formData.value.qualified = 0
+ formData.value.unqualified = 0
}
}
function calculatePass(){
@@ -144,7 +158,6 @@
const formattedTime = currentDate.toTimeString().split(' ')[0]; // HH:mm:ss
// 设置 reportDate 为当前日期和时间
saveData.value.reportDate = `${formattedDate} ${formattedTime}`;
- console.log(saveData.value)
}
@@ -177,6 +190,8 @@
nodeInfo.value.processCode = paramData.value.nodeCode
saveData.value.processCode = paramData.value.nodeCode
saveData.value.schedulingCode = paramData.value.schedulingCode
+ planCount.value = paramData.value.planCount
+ formData.value.reportCount = paramData.value.planCount
}
})
onShow(() => {
@@ -194,7 +209,6 @@
}
//数据转换
function transList(data) {
- console.log(data)
const list = data.map(item => {
return {
"label": item.workerName,
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index 55a1afc..4330a15 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -317,7 +317,7 @@
//工序完成
function nodeCodeFinish(item) {
- console.log(item)
+
proxy.$modal.confirm("是否确认完成工序").then(() => {
proxy.$modal.loading('加载中')
workSchedulingListApi.getWorkSchedulingProcessFinished(item.id).then((res) => {