diff --git a/src/views/mobileSupervise/Sampling.vue b/src/views/mobileSupervise/Sampling.vue index 3541bb0..a1a98ca 100644 --- a/src/views/mobileSupervise/Sampling.vue +++ b/src/views/mobileSupervise/Sampling.vue @@ -106,6 +106,9 @@ const editFun = ()=>{ //打开详情窗口 const getDataDetail =(row)=>{ editData.value=row + + editData.value.samplingNum =(row.samplingNum?row.samplingNum+ 0: 0); + console.log('samplingNum',editData.value.samplingNum) editData.value.samplingObjectList.forEach(async (x) => { x.departName = await getDepartShortNameFun(x.deptId) }) @@ -173,7 +176,7 @@ const computedData = (data)=>{ watch(()=>editData.value.samplingObjectList,()=>{ editData.value.samplingNum = editData.value.samplingObjectList.reduce((accumulator, currentValue) => { - return accumulator + ( currentValue.value?currentValue.value:0); + return accumulator + ( currentValue.value?Number(currentValue.value):0); },0) },{deep:true,immediate:true}) diff --git a/src/views/mobileSupervise/TaskProblem.vue b/src/views/mobileSupervise/TaskProblem.vue index 5ceee8d..192d4bc 100644 --- a/src/views/mobileSupervise/TaskProblem.vue +++ b/src/views/mobileSupervise/TaskProblem.vue @@ -65,7 +65,7 @@ > - +
@@ -116,7 +116,7 @@ link @click="upProblemStateFun(row)" > - {{row.problemState == '1'?'移至待确认':'移至问题项'}} + 删除 问题下发 - 删除 + + + + + + @@ -192,7 +192,7 @@
- + { + const issueMatterFun = async (row)=>{ + const data = await getTaskProblem(row.id) switch (row.taskType){ case "selfexamination": - issueForm.value.problemVo = row + issueForm.value.problemVo = data break; case "inspection": - issueForm.value.problemVo = row + issueForm.value.problemVo = data break; case "testing_alcohol": - issueForm.value.taskId = row.taskId; - issueForm.value.empNo =row.empNo; + issueForm.value.taskId = data.taskId; + issueForm.value.empNo =data.empNo; break; case "risk_personal": issueForm.value.supRecordId =row.id @@ -398,9 +399,14 @@ break } issueForm.value.tableKey=row.taskType; - distributeShow.value=true; } + + const addClose =()=>{ + issueForm.value={ + + } + } //下发问题 const handleSubmitTask =async ()=>{ await formRefs.value.validate(); @@ -431,11 +437,11 @@ } async function upProblemStateFun(row){ - await feedback.confirm(`确定要变更为${row.problemState == '1'?'待确认':'问题项'}状态?`); + await feedback.confirm(`确定要${row.problemState == '1'?'删除':'恢复'}该问题项(可在回收站中查看已删除的问题项)?`); upProblemState(row.id).then(res=>{ getList() }) - feedback.msgSuccess("变更成功"); + feedback.msgSuccess("操作成功"); } const query = ref({ actionType:"0"