|
@@ -957,11 +957,17 @@ const tableRef = ref(null)
|
|
const tabsKey = ref(Number(props.tabs))
|
|
const tabsKey = ref(Number(props.tabs))
|
|
const rowInfo = ref(props.row)
|
|
const rowInfo = ref(props.row)
|
|
|
|
|
|
|
|
+const isOverTask = ref(false)//是否结束任务
|
|
|
|
+
|
|
watch(
|
|
watch(
|
|
() => [props.tabs, props.row],
|
|
() => [props.tabs, props.row],
|
|
([key, row]) => {
|
|
([key, row]) => {
|
|
tabsKey.value = Number(key)
|
|
tabsKey.value = Number(key)
|
|
rowInfo.value = row
|
|
rowInfo.value = row
|
|
|
|
+ const { taskStatusName } = rowInfo.value
|
|
|
|
+ isOverTask.value = taskStatusName === '已审批'
|
|
|
|
+
|
|
|
|
+
|
|
},
|
|
},
|
|
{
|
|
{
|
|
immediate: true,
|
|
immediate: true,
|
|
@@ -1015,6 +1021,7 @@ const progressMoney = ref('0')
|
|
const meterApproveOpinion1 = ref({})
|
|
const meterApproveOpinion1 = ref({})
|
|
const meterApproveOpinion2 = ref({})
|
|
const meterApproveOpinion2 = ref({})
|
|
const isLoading = ref(false)
|
|
const isLoading = ref(false)
|
|
|
|
+
|
|
const getTableDetail = async () => {
|
|
const getTableDetail = async () => {
|
|
isLoading.value = true
|
|
isLoading.value = true
|
|
confirmLoading.value = true
|
|
confirmLoading.value = true
|
|
@@ -1038,13 +1045,18 @@ const getTableDetail = async () => {
|
|
ele.isTask = true
|
|
ele.isTask = true
|
|
})
|
|
})
|
|
flowListTask.value = arrUnion(firstarr, taskList)
|
|
flowListTask.value = arrUnion(firstarr, taskList)
|
|
|
|
+
|
|
}
|
|
}
|
|
//意见信息
|
|
//意见信息
|
|
const meterRes = getObjValue(data.meterApproveOpinion)
|
|
const meterRes = getObjValue(data.meterApproveOpinion)
|
|
meterApproveOpinion2.value = deepClone(meterRes)
|
|
meterApproveOpinion2.value = deepClone(meterRes)
|
|
meterApproveOpinion1.value = meterRes
|
|
meterApproveOpinion1.value = meterRes
|
|
- //设置默认值
|
|
|
|
- setDefaultOpinion()
|
|
|
|
|
|
+
|
|
|
|
+ if (isOverTask.value) {
|
|
|
|
+ //设置默认值
|
|
|
|
+ setDefaultOpinion()
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
//默认选中第一行
|
|
//默认选中第一行
|
|
let info = {}
|
|
let info = {}
|