11

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="rcid" :project-id="projectId" :type="type" :type-data="typeData"
+                    :contract-id="contractId" :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,10 +86,6 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
-    reportContractId: {
-        type: [String, Number],
-        default: '',
-    },
     classifyType: {
         type: [String, Number],
         default: '',
@@ -141,7 +137,6 @@ 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)
@@ -155,7 +150,7 @@ const formRef = ref(null)
 const processData = ref([])
 const formModel = ref({
     projectId: projectId.value,
-    contractId: rcid.value,
+    contractId: contractId.value,
     ids: props.ids,
     userTasks: null,
     taskName: props.taskName,
@@ -189,7 +184,6 @@ watch(() => [
     props.show,
     props.projectId,
     props.contractId,
-    props.reportContractId,
     props.classifyType,
     props.tableOwner,
     props.taskName,
@@ -201,7 +195,7 @@ watch(() => [
     props.datas,
     props.trialSelfInspectionRecordId,
     props.nodeId,
-], ([val, pid, cid, rCid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid]) => {
+], ([val, pid, cid, cla, tab, name, ids, url, addition, type, typeData, datas, trialSelfInspectionRecordId, nodeid]) => {
     isShow.value = val
     projectId.value = pid
     contractId.value = cid
@@ -209,11 +203,10 @@ watch(() => [
     tableOwner.value = tab
     ApiUrl.value = url
     nodeId.value = nodeid
-    rcid.value = rCid
     //更新到表单数据
     formModel.value = {
         projectId: pid,
-        contractId: rCid,
+        contractId: cid,
         ids: ids,
         taskName: name,
         taskContent: '',
@@ -267,7 +260,7 @@ const getProcessData = async (type, datas) => {
     infoIds.value = arrToId(reportDatas.value)
     const { error, code, data } = await queryFixedFlow1({
         projectId: projectId.value,
-        contractId: rcid.value,
+        contractId: contractId.value,
         nodeId:nodeId.value,
         classifyType:classifyType.value,
         tableOwner:tableOwner.value,
@@ -326,7 +319,7 @@ const queryFixedFlowApi3 = async (type, datas) => {
     linkUserJoinString.value = ''
     const { error, code, data, msg } = await queryFixedFlow3({
         projectId: projectId.value,
-        contractId: rcid.value,
+        contractId: contractId.value,
         ...flowJson,
         // nodeId:formModel.value.ids,
         classifyType:classifyType.value,
@@ -388,7 +381,7 @@ const batchApprovalApi = async () => {
     //发起请求
     const { error, code, data } = await ApprovalApi(ApiUrl.value, {
         projectId: projectId.value,
-        contractId: rcid.value,
+        contractId: contractId.value,
         ...formModel.value,
     })
     linkUserJoinString.value = ''

src/views/tentative/detect/commission.vue

@@ -159,7 +159,6 @@
             :show="showReportModal"
             :classify-type="classifyType"
             :addition="reportAddition"
-            :report-contract-id="reportContractId"
             :contract-id="contractId"
             :ids="reportIds"
             :project-id="projectId"
@@ -538,7 +537,6 @@ const reportIds = ref('')
 const reportTaskName = ref('')
 const showReportModal = ref(false)
 const reportAddition = ref({})
-const reportContractId = ref('')
 const reportClick = () => {
     const rows = tableCheckedKeys.value
     if (rows.length <= 0) {
@@ -555,9 +553,9 @@ const reportClick = () => {
         return
     }
     console.log(contractIds)
-    reportContractId.value = contractIds
+    //reportContractId.value = contractIds
     //处理类型
-    const { contractType } = contractInfo.value
+    //const { contractType } = contractInfo.value
     // 委托单上报设置为1
     classifyType.value = '1' //contractType > 0 ? contractType + '' : '1'
     //其它数据