|
|
@@ -155,7 +155,7 @@
|
|
|
<!--上报审批-->
|
|
|
<HcReportModal
|
|
|
title="上报审批"
|
|
|
- :url="tabTypeKey === 'query' ? 'informationWriteQuery/batchTask' : 'informationWriteQuery/taskOne'"
|
|
|
+ url="informationWriteQuery/batchTask"
|
|
|
:show="showReportModal"
|
|
|
:projectId="projectId"
|
|
|
:contractId="contractId"
|
|
|
@@ -163,7 +163,7 @@
|
|
|
:typeData="reportTypeData"
|
|
|
:taskName="reportTaskName"
|
|
|
:ids="reportIds"
|
|
|
- :isDatas="tabTypeKey === 'query'"
|
|
|
+ :isDatas="isReportModalDatas"
|
|
|
:datas="reportDatas"
|
|
|
@hide="showReportModal = false"
|
|
|
@finish="showReportFinish"
|
|
|
@@ -184,7 +184,6 @@ import firstApi from '~api/other/first-item';
|
|
|
import tasksApi from '~api/tasks/data';
|
|
|
import {getStoreData, setStoreData} from '~src/utils/storage'
|
|
|
import {getArrValue, isString, getObjValue, getObjNullValue,deepClone} from "vue-utils-plus"
|
|
|
-import queryApi from "~api/data-fill/query";
|
|
|
|
|
|
//变量
|
|
|
const router = useRouter()
|
|
|
@@ -583,14 +582,17 @@ const reportAddition = ref({})
|
|
|
const reportLoading = ref(false)
|
|
|
const reportTypeData = ref('')
|
|
|
const reportDatas = ref([])
|
|
|
+const isReportModalDatas = ref(false)
|
|
|
const reportModalClick = async () => {
|
|
|
const { primaryKeyId, contractIdRelation } = treeItem.value
|
|
|
let rows = [];
|
|
|
//处理获取流程的条件
|
|
|
if (tabTypeKey.value === 'mark') {
|
|
|
reportTypeData.value = tableFormId.value
|
|
|
+ isReportModalDatas.value = false
|
|
|
rows = tableFileData.value
|
|
|
} else {
|
|
|
+ isReportModalDatas.value = true
|
|
|
rows = tableSelectionKeys.value
|
|
|
}
|
|
|
if (rows.length > 0) {
|
