消息相关接口增加项目ID合同段ID

src/views/data-fill/query.vue

@@ -28,7 +28,7 @@
                             is-type
                             :auto-expand-keys="treeAutoExpandKeys"
                             default-expand-all
-                            @nodeTap="wbsElTreeClick"
+                            @node-tap="wbsElTreeClick"
                         />
                     </el-scrollbar>
                     <el-scrollbar v-show="!isSearchTree" class="scroll-bar-right-16">
@@ -38,7 +38,7 @@
                             is-counts
                             is-type
                             @load="treeLoadNode"
-                            @nodeTap="wbsElTreeClick"
+                            @node-tap="wbsElTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -218,7 +218,7 @@
             url="informationWriteQuery/batchTask"
             @finish="showReportFinish"
             @hide="showReportModal = false"
-            @tagClose="reportTaskTagClose"
+            @tag-close="reportTaskTagClose"
         />
     </div>
 </template>
@@ -699,7 +699,7 @@ const batchAbolishClick = () => {
 }
 //废除勾选的已上报文件
 const batchAbolishSave = async (ids) => {
-    const { error, code } = await queryApi.batchAbolish({ ids: ids })
+    const { error, code } = await queryApi.batchAbolish({ ids: ids, projectId:projectId.value, contractId:contractId.value })
     //处理数据
     if (!error && code === 200) {
         window.$message?.success('批量废除成功')

src/views/data-fill/wbs.vue

@@ -36,8 +36,8 @@
                                 is-type
                                 :auto-expand-keys="TreeAutoExpandKeys"
                                 default-expand-all
-                                @nodeTap="wbsElTreeClick"
-                                @menuTap="ElTreeMenuClick"
+                                @node-tap="wbsElTreeClick"
+                                @menu-tap="ElTreeMenuClick"
                             />
                         </el-scrollbar>
                         <el-scrollbar v-show="!isSearchTree" class="scroll-bar-right-16">
@@ -51,9 +51,9 @@
                                 show-checkbox
                                 check-strictly
                                 @load="treeLoadNode"
-                                @menuTap="ElTreeMenuClick"
-                                @nodeLoading="ElTreeNodeLoading"
-                                @nodeTap="wbsElTreeClick"
+                                @menu-tap="ElTreeMenuClick"
+                                @node-loading="ElTreeNodeLoading"
+                                @node-tap="wbsElTreeClick"
                                 @check="ElTreeNodeCheck"
                             />
                         </el-scrollbar>
@@ -118,9 +118,9 @@
                             :wbs-type="2"
                             :treenode-data-info="nodeDataInfo"
                             :newlistdata="newlistdata"
-                            @offsetTop="ListItemOffsetTop"
+                            @offset-top="ListItemOffsetTop"
                             @renew="getTableDataAll"
-                            @getList="searchNodeAllTable1"
+                            @get-list="searchNodeAllTable1"
                         />
                     </el-scrollbar>
                     <HcStatus v-else text="暂无表单" />
@@ -148,9 +148,9 @@
                 :is-mark="TreeMark"
                 :menus="ElTreeMenu"
                 :project-id="projectId"
-                @menuClick="NodeTreeMenuClick"
-                @nodeClick="NodeTreeClick"
-                @nodeDblClick="NodeTreeDblClick"
+                @menu-click="NodeTreeMenuClick"
+                @node-click="NodeTreeClick"
+                @node-dbl-click="NodeTreeDblClick"
             />
             <template #action>
                 <div class="hc-tree-mp-tip-box">
@@ -174,7 +174,7 @@
                         :tenant-id="userInfo?.tenant_id"
                         :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
                         :wbs-type="2"
-                        @offsetTop="ListItemOffsetTop"
+                        @offset-top="ListItemOffsetTop"
                         @renew="getTableDataAll"
                     />
                 </el-scrollbar>
@@ -336,7 +336,7 @@
             <div v-if="copyNodeTabKey !== '1'" class="copy-node-many-box">
                 <div class="copy-node-many-tree">
                     <el-scrollbar>
-                        <HcLazyTree :auto-expand-keys="TreeAutoExpandKeys" is-type @load="treeLoadNode" @nodeTap="copyNodeElTreeClick" />
+                        <HcLazyTree :auto-expand-keys="TreeAutoExpandKeys" is-type @load="treeLoadNode" @node-tap="copyNodeElTreeClick" />
                     </el-scrollbar>
                 </div>
                 <div class="copy-node-many-table">
@@ -1765,6 +1765,8 @@ const abolishOneSave = async () => {
     const { error, code } = await wbsApi.abolishOne({
         primaryKeyId: info?.primaryKeyId || '',
         classify: authBtnTabKey.value,
+        projectId:projectId.value,
+        contractId:contractId.value,
     })
     abolishLoaing.value = false
     if (!error && code === 200) {

src/views/ledger/components/table-list.vue

@@ -94,7 +94,7 @@
             url="contractLog/batchTask"
             @finish="showReportFinish"
             @hide="showReportModal = false"
-            @tagClose="reportTaskTagClose"
+            @tag-close="reportTaskTagClose"
         />
     </div>
 </template>
@@ -312,7 +312,7 @@ const batchAbolishClick = () => {
 //废除勾选的已上报文件
 const batchAbolishSave = async (ids) => {
     abolishLoading.value = true
-    const { error, code } = await queryApi.batchAbolish({ ids: ids })
+    const { error, code } = await queryApi.batchAbolish({ ids: ids, projectId:projectId.value, contractId:contractId.value })
     //处理数据
     abolishLoading.value = false
     if (!error && code === 200) {

src/views/other/first-item.vue

@@ -13,7 +13,7 @@
                 <el-scrollbar>
                     <WbsTree
                         :auto-expand-keys="TreeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
-                        @nodeTap="nodeWbsElTreeClick"
+                        @node-tap="nodeWbsElTreeClick"
                     />
                 </el-scrollbar>
             </div>
@@ -221,7 +221,7 @@
             url="informationWriteQuery/batchTask"
             @finish="showReportFinish"
             @hide="showReportModal = false"
-            @tagClose="reportTaskTagClose"
+            @tag-close="reportTaskTagClose"
         />
     </div>
 </template>
@@ -518,6 +518,8 @@ const abolishOneSave = async () => {
     const { error, code } = await wbsApi.abolishOneSJ({
         primaryKeyId: info?.primaryKeyId || '',
         id: queryNodeStatusId.value,
+        projectId:projectId.value,
+        contractId:contractId.value,
     })
     if (!error && code === 200) {
         window.$message?.success('撤回成功')
@@ -881,7 +883,7 @@ const batchAbolishClick = () => {
 }
 //废除勾选的已上报文件
 const batchAbolishSave = async (ids) => {
-    const { error, code } = await queryApi.batchAbolish({ ids: ids })
+    const { error, code } = await queryApi.batchAbolish({ ids: ids, projectId:projectId.value, contractId:contractId.value })
     //处理数据
     if (!error && code === 200) {
         window.$message?.success('批量废除成功')

src/views/other/first-itemcopy.vue

@@ -13,7 +13,7 @@
                 <el-scrollbar>
                     <WbsTree
                         :auto-expand-keys="TreeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
-                        @nodeTap="nodeWbsElTreeClick"
+                        @node-tap="nodeWbsElTreeClick"
                     />
                 </el-scrollbar>
             </div>
@@ -155,7 +155,7 @@
                             :status="NodeStatus"
                             :table-file-data="tableFileData"
                             :tree-item="treeItem"
-                            @offsetTop="ListItemOffsetTop"
+                            @offset-top="ListItemOffsetTop"
                             @renew="renewtable"
                         />
                     </el-scrollbar>
@@ -228,7 +228,7 @@
             url="informationWriteQuery/batchTask"
             @finish="showReportFinish"
             @hide="showReportModal = false"
-            @tagClose="reportTaskTagClose"
+            @tag-close="reportTaskTagClose"
         />
     </div>
 </template>
@@ -877,7 +877,7 @@ const batchAbolishClick = () => {
 }
 //废除勾选的已上报文件
 const batchAbolishSave = async (ids) => {
-    const { error, code } = await queryApi.batchAbolish({ ids: ids })
+    const { error, code } = await queryApi.batchAbolish({ ids: ids, projectId:projectId.value, contractId:contractId.value })
     //处理数据
     if (!error && code === 200) {
         window.$message?.success('批量废除成功')

src/views/tasks/hc-data.vue

@@ -1,15 +1,15 @@
 <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"
-                    :select-contrac-id="selectContracId" @batchApproval="batchApprovalTaskClick"
-                    @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
-                    @changeselectContracId="changeselectContracId"
+                    :select-contrac-id="selectContracId" @batch-approval="batchApprovalTaskClick"
+                    @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
+                    @changeselect-contrac-id="changeselectContracId"
                 />
             </template>
             <template #tab-key2>
@@ -17,10 +17,10 @@
                     v-if="sbTableKey === 'key2'" :contract-id="contractId"
                     :contract-list="contractList"
                     :project-id="projectId" :table-key="sbTableKey"
-                    :select-contrac-id="selectContracId" @batchApproval="batchApprovalTaskClick"
-                    @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
-                    @changeselectContracId="changeselectContracId"
+                    :select-contrac-id="selectContracId" @batch-approval="batchApprovalTaskClick"
+                    @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
+                    @changeselect-contrac-id="changeselectContracId"
                 />
             </template>
             <template #tab-key3>
@@ -28,10 +28,10 @@
                     v-if="sbTableKey === 'key3'" :contract-id="contractId"
                     :contract-list="contractList"
                     :project-id="projectId" :table-key="sbTableKey"
-                    :select-contrac-id="selectContracId" @batchApproval="batchApprovalTaskClick"
-                    @rowTaskName="rowTaskName"
-                    @signRules="setSignRulesClick"
-                    @changeselectContracId="changeselectContracId"
+                    :select-contrac-id="selectContracId" @batch-approval="batchApprovalTaskClick"
+                    @row-task-name="rowTaskName"
+                    @sign-rules="setSignRulesClick"
+                    @changeselect-contrac-id="changeselectContracId"
                 />
             </template>
         </HcTabsSimple>
@@ -101,7 +101,7 @@
             </div>
             <div class="obj-item-cell">
                 <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">开启系统自动电签</div>
@@ -395,6 +395,8 @@ const batchCompleteApprovalTask = async () => {
         approvalType,
         formDataId,
         parallelProcessInstanceIds,
+        projectId:projectId.value,
+        contractId:contractId.value,
     }, false)
     //处理数据
     SMSAuthLoading.value = false

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

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

@@ -63,14 +63,14 @@
                     :node-idvalue="nodeIdvalue"
                     :status="1"
                     :tab-type-key="tabTypeKey"
-                    @chageorinData="chageorinData"
-                    @changeIscanclick="changeIscanclick"
+                    @chageorin-data="chageorinData"
+                    @change-iscanclick="changeIscanclick"
                     @changesdate="changeorinsdate"
-                    @changesingSaveId="changesingSaveId"
-                    @offsetTop="ListItemOffsetTop"
+                    @changesing-save-id="changesingSaveId"
+                    @offset-top="ListItemOffsetTop"
                     @renew="getTableDataAll"
-                    @upcheckTableId="upcheckTableId"
-                    @updeviceUseIds="updeviceUseIds"
+                    @upcheck-table-id="upcheckTableId"
+                    @updevice-use-ids="updeviceUseIds"
                 />
             </el-scrollbar>
             <HcStatus v-else v-loading="isLoadList" text="暂无表单" />
@@ -170,7 +170,7 @@
                             :check-strictly="true"
                             :default-checked-keys="defaultCheckarrIds"
                             @load="treeLoadNode"
-                            @nodeTap="divisionTreeClick"
+                            @node-tap="divisionTreeClick"
                             @check="divisionTreeCheck"
                         />
                     </el-scrollbar>
@@ -187,7 +187,7 @@
                             :mix-ratio-test-tree-data="MixRatioTestTreeData" :from-type="true"
                             :node-id="nodeId" :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @nodeTap="linksRawTreeClick"
+                            @node-tap="linksRawTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -209,7 +209,7 @@
                         <TestTree
                             :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @nodeTap="linksSampleTreeClick"
+                            @node-tap="linksSampleTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -1400,6 +1400,8 @@ const abolishOneSave = async () => {
         // primaryKeyId:  info?.primaryKeyId || '',
         primaryKeyId: dataId.length > 0 ? dataId : nodeIdvalue.value,
         classify: authBtnTabKey.value,
+        projectId:projectId.value,
+        contractId:contractId.value,
     })
     if (!error && code === 200) {
         window.$message?.success('撤回成功')

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

@@ -71,15 +71,15 @@
                     :status="1"
                     :tab-type-key="tabTypeKey"
                     :newlistdata="newlistdata"
-                    @chageorinData="chageorinData"
-                    @changeIscanclick="changeIscanclick"
+                    @chageorin-data="chageorinData"
+                    @change-iscanclick="changeIscanclick"
                     @changesdate="changeorinsdate"
-                    @changesingSaveId="changesingSaveId"
-                    @offsetTop="ListItemOffsetTop"
+                    @changesing-save-id="changesingSaveId"
+                    @offset-top="ListItemOffsetTop"
                     @renew="getTableDataAll"
-                    @upcheckTableId="upcheckTableId"
-                    @updeviceUseIds="updeviceUseIds"
-                    @getList="searchNodeAllTable1"
+                    @upcheck-table-id="upcheckTableId"
+                    @updevice-use-ids="updeviceUseIds"
+                    @get-list="searchNodeAllTable1"
                 />
             </el-scrollbar>
             <HcStatus v-else v-loading="isLoadList" text="暂无表单" />
@@ -130,7 +130,7 @@
                             :check-strictly="true"
                             :default-checked-keys="defaultCheckarrIds"
                             @load="treeLoadNode"
-                            @nodeTap="divisionTreeClick"
+                            @node-tap="divisionTreeClick"
                             @check="divisionTreeCheck"
                         />
                     </el-scrollbar>
@@ -147,7 +147,7 @@
                             :mix-ratio-test-tree-data="MixRatioTestTreeData" :from-type="true"
                             :node-id="nodeId" :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @nodeTap="linksRawTreeClick"
+                            @node-tap="linksRawTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -169,7 +169,7 @@
                         <TestTree
                             :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @nodeTap="linksSampleTreeClick"
+                            @node-tap="linksSampleTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -1425,6 +1425,8 @@ const abolishOneSave = async () => {
         // primaryKeyId:  info?.primaryKeyId || '',
         primaryKeyId: dataId.length > 0 ? dataId : nodeIdvalue.value,
         classify: authBtnTabKey.value,
+        projectId:projectId.value,
+        contractId:contractId.value,
     })
     if (!error && code === 200) {
         window.$message?.success('撤回成功')