委托单

src/global/components/hc-tasks-user/index.vue

@@ -14,7 +14,7 @@
         </div>
 
         <!-- 选择任务人 -->
-        <hc-new-dialog v-model="showModal" title="选择任务人" widths="62rem">
+        <hc-new-dialog v-model="showModal" ui="hc-tasks-user-modal-dialog" title="选择任务人" widths="62rem">
             <div class="hc-tasks-user-modal-content-box">
                 <div class="tree-box">
                     <el-scrollbar>
@@ -487,6 +487,9 @@ const getCheckCustomFlowUserIsEVisaPermissions3 = async (flowJson, newUser, newU
         margin: 4px 0;
     }
 }
+.el-overlay-dialog .el-dialog.hc-new-dialog.hc-tasks-user-modal-dialog .el-dialog__body {
+    padding: 0;
+}
 .hc-tasks-user-modal-content-box {
     .checkbox-li .el-checkbox {
         width: 100%;
@@ -514,6 +517,9 @@ const getCheckCustomFlowUserIsEVisaPermissions3 = async (flowJson, newUser, newU
             margin-right: 10px;
             margin-top: 12px;
         }
+        .el-scrollbar__bar.is-vertical {
+            right: -20px;
+        }
     }
 }
 </style>

src/views/tentative/detect/commission.vue

@@ -143,7 +143,7 @@
             :show="showReportModal"
             :classify-type="classifyType"
             :addition="reportAddition"
-            :contract-id="delegateContractId"
+            :contract-id="reportContractId"
             :ids="reportIds"
             :project-id="projectId"
             :task-name="reportTaskName"
@@ -477,6 +477,7 @@ 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) {
@@ -487,17 +488,19 @@ const reportClick = () => {
         return
     }
     //判断状态
-    const { id, status, name } = { ...rows[0] }
-    if (status === 1) {
+    const { id, status, entrustName, contractId: contractIds } = { ...rows[0] }
+    if (status !== 1) {
         window.$message.warning('只能选择未上报的数据进行上报')
         return
     }
+    console.log(contractIds)
+    reportContractId.value = contractIds
     //处理类型
     const { contractType } = contractInfo.value
     classifyType.value = contractType > 0 ? contractType + '' : '1'
     //其它数据
     reportIds.value = id //数据ID
-    reportTaskName.value = name //任务名称
+    reportTaskName.value = entrustName //任务名称
     //附加数据
     const { contractIdRelation } = nodeDataInfo.value
     reportAddition.value = {