试验上报接口新增入参trialSelfInspectionRecordId

src/global/components/hc-report-modal/index.vue

@@ -95,6 +95,10 @@ const props = defineProps({
         type: [String, Number, Array, Object],
         default: ''
     },
+    trialSelfInspectionRecordId:{
+        type: [String,Number],
+        default: ''
+    }
 })
 
 //变量
@@ -111,7 +115,7 @@ const formRef = ref(null)
 const processData = ref([])
 const formModel = ref({
     projectId: projectId.value, contractId: contractId.value, ids: props.ids, userTasks: null,
-    taskName: props.taskName, taskContent: '', fixedFlowId: '', batch: 1, restrictDay: 1,
+    taskName: props.taskName, taskContent: '', fixedFlowId: '', batch: 1, restrictDay: 1,trialSelfInspectionRecordId:props.trialSelfInspectionRecordId,
     ...props.addition
 })
 const formRules = ref({
@@ -143,8 +147,9 @@ watch(() => [
     props.addition,
     props.type,
     props.typeData,
-    props.datas
-], ([val,pid,cid,name,ids,url,addition, type, typeData, datas]) => {
+    props.datas,
+    props.trialSelfInspectionRecordId
+], ([val,pid,cid,name,ids,url,addition, type, typeData, datas,trialSelfInspectionRecordId]) => {
     isShow.value = val
     projectId.value = pid
     contractId.value = cid
@@ -152,7 +157,7 @@ watch(() => [
     //更新到表单数据
     formModel.value = {
         projectId: pid, contractId: cid, ids: ids, taskName: name,
-        taskContent: '', fixedFlowId: '', batch: 1, restrictDay: 1,
+        taskContent: '', fixedFlowId: '', batch: 1, restrictDay: 1,trialSelfInspectionRecordId:trialSelfInspectionRecordId,
         ...addition
     }
     isTypes.value = type

src/views/tentative/detect/test-form.vue

@@ -133,7 +133,7 @@
         
         <!--批量上报审批-->
         <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"/>
+        :taskName="reportTaskName" :ids="reportIds" :addition="reportAddition" :trialSelfInspectionRecordId="dataId" @hide="showReportModal = false" @finish="showReportFinish"/>
     </div>
 </template>