1.修复综合首页跳转申报审批与返回404

2.修复资产-我的订单重置搜索条件后无查询结果

src/views/assets/myOrderList.vue

@@ -471,8 +471,21 @@ export default {
         resetParams() {
             this.$router.push({ query: {} });
             this.listQuery = {
-                current: 1,
+                page: 1,
                 size: 10,
+                current: 1,
+                // 节点code
+                nodeCode: null,
+                // 客户经理id
+                clientManagerId: this.$store.getters.userInfo.id,
+                // 项目负责人id
+                principalId: null,
+                // 业务类型
+                assetsBusinessGener: null,
+                // 关键字
+                keyWord: null,
+                // 送达状态
+                delivery: null
             }
             this.selectMyOrderPage();
         },

src/views/complex/index.vue

@@ -252,7 +252,8 @@
               </svg>
               <div class="icon-word">土规下单</div>
             </div>
-            <div class="icon-area" v-if="meunNames.includes('资产业务')" @click="openOrder('/assets/addOrder?back=/complex/index')">
+            <div class="icon-area" v-if="meunNames.includes('资产业务')"
+              @click="openOrder('/assets/addOrder?back=/complex/index')">
               <svg t="1716189375497" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
                 p-id="2709" width="48" height="48">
                 <path
@@ -530,7 +531,8 @@
                 <parentTable :data="majorDeclareCheckList" stripe border style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
-                      <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' ? '市场人员提成申报' : '评估人员提成申报' }}</span>
+                      <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_MAJOR_MARKET' ? '市场人员提成申报' :
+                        '评估人员提成申报' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="订单号" width="120" align="center">
@@ -620,7 +622,8 @@
                 <parentTable :data="assetsDeclareCheckList" stripe border style="width: 100%">
                   <el-table-column label="审批类型" width="150" align="center">
                     <template slot-scope="{row}">
-                      <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_ASSET_MARKET' ? '市场人员提成申报' : '评估人员提成申报' }}</span>
+                      <span style="color:red">{{ row.businessType === 'COMMISSION_DECLARE_ASSET_MARKET' ? '市场人员提成申报' :
+                        '评估人员提成申报' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="订单号" width="120" align="center">
@@ -680,7 +683,8 @@
                   </el-table-column>
                   <el-table-column label="操作" align="center">
                     <template slot-scope="{row}">
-                      <el-button type="text" size="small" @click="majorCheck(row)">审核</el-button>
+                      <el-button type="text" size="small"
+                        @click="assetsDeclareCheck(row)">审核</el-button>
                     </template>
                   </el-table-column>
                 </parentTable>
@@ -821,7 +825,7 @@ export default {
         }
       })
     },
-    assetsDeclareTodoList(){
+    assetsDeclareTodoList() {
       this.$api.commissonDeclare.assetsCheckList().then(res => {
         if (res.code === 200) {
           this.assetsDeclareCheckList = res.data;
@@ -965,6 +969,10 @@ export default {
       } else {
         this.$router.push({ path: '/income/major/declare/evaluate', query: {} });
       }
+    },
+    assetsDeclareCheck(row) {
+      let backPath = '/income/assets/declare/check';
+      this.$router.push(`/income/assets/declare/detail?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}`)
     }
   },