11

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240906111327"
+  "value": "20240906173337"
 }

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

@@ -31,7 +31,7 @@
             </el-form-item>
             <el-form-item v-if="diyProcessUser" label="任务人" prop="userTasks">
                 <HcTasksUser
-                    :contract-id="contractId" :project-id="projectId" :type="type" :type-data="typeData"
+                    :contract-id="rcid" :project-id="projectId" :type="type" :type-data="typeData"
                     ui="w-full" :classify-type="classifyType" :table-owner="tableOwner" :node-id="formModel.ids ? formModel.ids : nodeId "
                     :info-ids="infoIds" @change="diyProcessUserChange"
                 />
@@ -86,6 +86,10 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    reportContractId: {
+        type: [String, Number],
+        default: '',
+    },
     classifyType: {
         type: [String, Number],
         default: '',
@@ -137,6 +141,7 @@ const emit = defineEmits(['hide', 'finish', 'tagClose'])
 const isShow = ref(props.show)
 const projectId = ref(props.projectId)
 const contractId = ref(props.contractId)
+const rcid = ref(props.reportContractId)
 const classifyType = ref(props.classifyType)
 const tableOwner = ref(props.tableOwner)
 const ApiUrl = ref(props.url)
@@ -150,7 +155,7 @@ const formRef = ref(null)
 const processData = ref([])
 const formModel = ref({
     projectId: projectId.value,
-    contractId: contractId.value,
+    contractId: rcid.value,
     ids: props.ids,
     userTasks: null,
     taskName: props.taskName,
@@ -184,6 +189,7 @@ watch(() => [
     props.show,
     props.projectId,
     props.contractId,
+    props.reportContractId,
     props.classifyType,
     props.tableOwner,
     props.taskName,
@@ -195,7 +201,7 @@ watch(() => [
     props.datas,
     props.trialSelfInspectionRecordId,
     props.nodeId,
-], ([val, pid, cid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid]) => {
+], ([val, pid, cid, rCid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid]) => {
     isShow.value = val
     projectId.value = pid
     contractId.value = cid
@@ -203,10 +209,11 @@ watch(() => [
     tableOwner.value = tab
     ApiUrl.value = url
     nodeId.value = nodeid
+    rcid.value = rCid
     //更新到表单数据
     formModel.value = {
         projectId: pid,
-        contractId: cid,
+        contractId: rCid,
         ids: ids,
         taskName: name,
         taskContent: '',
@@ -260,7 +267,7 @@ const getProcessData = async (type, datas) => {
     infoIds.value = arrToId(reportDatas.value)
     const { error, code, data } = await queryFixedFlow1({
         projectId: projectId.value,
-        contractId: contractId.value,
+        contractId: rcid.value,
         nodeId:nodeId.value,
         classifyType:classifyType.value,
         tableOwner:tableOwner.value,
@@ -319,7 +326,7 @@ const queryFixedFlowApi3 = async (type, datas) => {
     linkUserJoinString.value = ''
     const { error, code, data, msg } = await queryFixedFlow3({
         projectId: projectId.value,
-        contractId: contractId.value,
+        contractId: rcid.value,
         ...flowJson,
         // nodeId:formModel.value.ids,
         classifyType:classifyType.value,
@@ -381,7 +388,7 @@ const batchApprovalApi = async () => {
     //发起请求
     const { error, code, data } = await ApprovalApi(ApiUrl.value, {
         projectId: projectId.value,
-        contractId: contractId.value,
+        contractId: rcid.value,
         ...formModel.value,
     })
     linkUserJoinString.value = ''

src/views/tentative/detect/commission.vue

@@ -159,7 +159,8 @@
             :show="showReportModal"
             :classify-type="classifyType"
             :addition="reportAddition"
-            :contract-id="reportContractId"
+            :report-contract-id="reportContractId"
+            :contract-id="contractId"
             :ids="reportIds"
             :project-id="projectId"
             :task-name="reportTaskName"