소스 검색

任务消息相关增加项目ID合同段ID

duy 1 년 전
부모
커밋
0f388f6f13
3개의 변경된 파일16개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 0
      src/views/file/collection.vue
  2. 10 10
      src/views/tasks/hc-data.vue
  3. 4 0
      src/views/tasks/message-data.vue

+ 2 - 0
src/views/file/collection.vue

@@ -984,6 +984,8 @@ const repealModalClick = async () => {
                     const { error, code } = await tasksFlowApi.batchRepealTaskArchive({
                         ids: keys,
                         type:1,
+                        projectId:projectId.value,
+                        contractId:contractId.value,
                     })
                     if (!error && code === 200) {
                         window.$message?.success('废除成功!')

+ 10 - 10
src/views/tasks/hc-data.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="hc-layout-box">
-        <HcTabsSimple :no-drop-shadow="showTaskReviewModal" :cur="sbTableKey" :datas="sbTableData" @tabClick="sbTableClick">
+        <HcTabsSimple :no-drop-shadow="showTaskReviewModal" :cur="sbTableKey" :datas="sbTableData" @tab-click="sbTableClick">
             <template #tab-key1>
                 <TableCard
                     v-if="sbTableKey === 'key1'" :contract-id="contractId"
                     :contract-list="contractList"
                     :project-id="projectId" :table-key="sbTableKey"
-                    @batchApproval="batchApprovalTaskClick" @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
+                    @batch-approval="batchApprovalTaskClick" @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
                 />
             </template>
             <template #tab-key2>
@@ -15,8 +15,8 @@
                     v-if="sbTableKey === 'key2'" :contract-id="contractId"
                     :contract-list="contractList"
                     :project-id="projectId" :table-key="sbTableKey"
-                    @batchApproval="batchApprovalTaskClick" @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
+                    @batch-approval="batchApprovalTaskClick" @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
                 />
             </template>
             <template #tab-key3>
@@ -24,8 +24,8 @@
                     v-if="sbTableKey === 'key3'" :contract-id="contractId"
                     :contract-list="contractList"
                     :project-id="projectId" :table-key="sbTableKey"
-                    @batchApproval="batchApprovalTaskClick" @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
+                    @batch-approval="batchApprovalTaskClick" @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
                 />
             </template>
         </HcTabsSimple>
@@ -121,7 +121,7 @@
                 <div class="label">
                     默认处理时间(时)
                 </div>
-                <HcCounter v-model="formReport.date" @update:modelValue="dateUpdateValue" />
+                <HcCounter v-model="formReport.date" @update:model-value="dateUpdateValue" />
             </div>
             <div class="obj-item-cell">
                 <div class="label">
@@ -478,7 +478,7 @@ const SMSAuthCancel = () => {
 //单个审批
 const saveCompleteApprovalTask = async () => {
     SMSAuthLoading.value = true
-    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value }, false)
+    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value, projectId:projectId.value, contractId:contractId.value }, false)
     //处理数据
     SMSAuthLoading.value = false
     if (!error && code === 200) {
@@ -498,7 +498,7 @@ const saveCompleteApprovalTask = async () => {
 //批量审批
 const batchCompleteApprovalTask = async () => {
     SMSAuthLoading.value = true
-    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value }, false)
+    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value, projectId:projectId.value, contractId:contractId.value }, false)
     //处理数据
     SMSAuthLoading.value = false
     if (!error && code === 200) {

+ 4 - 0
src/views/tasks/message-data.vue

@@ -256,6 +256,8 @@ const removeData = async (rows) => {
     //请求数据
     const { error, code } = await messageApi.removeData({
         ids: ids,
+        projectId:projectId.value,
+        contractId:contractId.value,
     }, false)
     //处理返回数据
     delLoading.value = false
@@ -296,6 +298,8 @@ const setMessageWarningReadApi = async (ids, getTable = true) => {
     //请求数据
     const { error, code } = await messageApi.setMessageWarningRead({
         ids: ids,
+        projectId:projectId.value,
+        contractId:contractId.value,
     }, false)
     //处理返回数据
     markReadLoading.value = false