|
@@ -393,8 +393,13 @@
|
|
|
</HcDialog>
|
|
|
|
|
|
<!--批量上报审批-->
|
|
|
- <HcReportModal title="批量上报审批" url="informationWriteQuery/taskOne" :show="showReportModal" :projectId="projectId" :contractId="contractId" type="wbs" :typeData="reportTypeData"
|
|
|
- :taskName="reportTaskName" :ids="reportIds" :addition="reportAddition" @hide="showReportModal = false" @finish="showReportFinish"/>
|
|
|
+ <HcReportModal title="批量上报审批" url="informationWriteQuery/taskOne"
|
|
|
+ :show="showReportModal"
|
|
|
+ :projectId="projectId"
|
|
|
+ :contractId="contractInfo?.contractType==2?nodeDataInfo?.contractIdRelation:contractId"
|
|
|
+ type="wbs"
|
|
|
+ :typeData="reportTypeData"
|
|
|
+ :taskName="reportTaskName" :ids="reportIds" :addition="reportAddition" @hide="showReportModal = false" @finish="showReportFinish"/>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -1258,7 +1263,8 @@ const reportModalClick = async () => {
|
|
|
reportLoading.value = true
|
|
|
const taskCheck = await eVisaTaskCheckApi({
|
|
|
projectId: projectId.value,
|
|
|
- contractId: contractId.value
|
|
|
+ contractId:contractInfo.value?.contractType==2?info?.contractIdRelation:contractId.value
|
|
|
+ // contractId: contractId.value
|
|
|
})
|
|
|
//处理数据
|
|
|
let newArr = [];
|
|
@@ -1291,7 +1297,7 @@ const reportModalClick = async () => {
|
|
|
const showReportFinish = () => {
|
|
|
showReportModal.value = false
|
|
|
getTableDataAll()
|
|
|
- window?.location?.reload() //刷新页面
|
|
|
+ // window?.location?.reload() //刷新页面
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1316,6 +1322,7 @@ const tableFormSaveClick = async () => {
|
|
|
setFormRegExpJson(FormRegExpJson)
|
|
|
} else if (FormData.length > 0) {
|
|
|
tableFormSaveLoading.value = true
|
|
|
+ console.log(FormData,'FormData')
|
|
|
const {error, code} = await wbsApi.saveExcelBussData({
|
|
|
dataInfo: {orderList: FormData}
|
|
|
})
|
|
@@ -1369,12 +1376,14 @@ const setFormRegExpJson = (FormRegExpJson) => {
|
|
|
const bussPdfsLoading = ref(false)
|
|
|
const bussPdfsClick = async () => {
|
|
|
const info = nodeDataInfo.value;
|
|
|
+ console.log(info,'info')
|
|
|
bussPdfsLoading.value = true
|
|
|
const {error, code, data} = await wbsApi.getBussPdfs({
|
|
|
nodeId: info?.primaryKeyId || '',
|
|
|
classify: authBtnTabKey.value,
|
|
|
projectId: projectId.value,
|
|
|
- contractId: contractId.value
|
|
|
+ // contractId: contractId.value
|
|
|
+ contractId:contractInfo.value?.contractType==2?info?.contractIdRelation:contractId.value
|
|
|
})
|
|
|
tableFormSaveLoading.value = false
|
|
|
bussPdfsLoading.value = false
|