1.页面优化

2.流程退回优化
3.综合首页出库审批新增自动打开审批弹窗
4.修复综合首页资产列表控制台报错

src/views/assets/addAssetsOrder.vue

@@ -111,7 +111,7 @@
                                             class="postInfo-container-item">
                                             <div>
                                                 <el-select v-model="assetsForm.clienteleContactId" placeholder="请选择(可搜索)"
-                                                    clearable filterable @change="getContactInfo"style=" width: 80%">
+                                                    clearable filterable @change="getContactInfo" style=" width: 80%">
                                                     <el-option v-for="(c, id) in customerContract" :label="c.name"
                                                         :value="c.id"></el-option>
                                                 </el-select>
@@ -127,21 +127,21 @@
                                         <el-form-item label="联系人电话：" prop="mobile" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.mobile" class="filter-item" readonly disabled
-                                            style=" width: 100%" />
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="联系人部门：" prop="department" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.department" class="filter-item" readonly disabled
-                                            style=" width: 100%" />
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="联系人职务：" prop="duty" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-input :value="linkmanInfo.duty" class="filter-item" readonly disabled
-                                            style=" width: 100%" />
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -208,13 +208,15 @@
                                     <el-col :xs="12" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="委托联系人电话：" prop="bailorContactTel" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item" style=" width: 100%"/>
+                                            <el-input v-model="assetsForm.bailorContactTel" class="filter-item"
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                     <el-col :xs="12" :sm="8" :lg="6" :span="6">
                                         <el-form-item label="委托人地址：" prop="bailorAddress" label-width="170px"
                                             class="postInfo-container-item">
-                                            <el-input v-model="assetsForm.bailorAddress" class="filter-item" style=" width: 100%"/>
+                                            <el-input v-model="assetsForm.bailorAddress" class="filter-item"
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -223,7 +225,8 @@
                                         <el-form-item label="终端客户类型：" prop="terminalClienteleType" label-width="170px"
                                             class="postInfo-container-item">
                                             <el-select @change="changeTCustomerType(assetsForm.terminalClienteleType)"
-                                                v-model="assetsForm.terminalClienteleType" placeholder="请选择" style=" width: 100%">
+                                                v-model="assetsForm.terminalClienteleType" placeholder="请选择"
+                                                style=" width: 100%">
                                                 <el-option label="企业" value="企业"></el-option>
                                                 <el-option label="个人" value="个人"></el-option>
                                             </el-select>
@@ -259,7 +262,7 @@
                                                     placeholder="请选择(可搜索)" clearable filterable @change="getTcontactInfo()"
                                                     style=" width: 80%">
                                                     <el-option v-for="(c, id) in tCustomerContract" :label="c.name"
-                                                        :value="c.id" ></el-option>
+                                                        :value="c.id"></el-option>
                                                 </el-select>
                                                 <el-tooltip class="item" effect="dark" content="没有联系人？点击新增"
                                                     placement="top-end">
@@ -272,7 +275,8 @@
                                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                                         <el-form-item label="终端联系电话：" v-if="assetsForm.terminalClienteleType" prop="tmobile"
                                             label-width="170px" class="postInfo-container-item">
-                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled style=" width: 100%"/>
+                                            <el-input :value="assetsForm.tmobile" class="filter-item" readonly disabled
+                                                style=" width: 100%" />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -1296,29 +1300,32 @@ export default {
         },
         // 更新订单
         updateOrder() {
-            this.$confirm('是否确定要修改订单信息?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.$api.assets.update(this.assetsForm).then(res => {
-                    if (res.code === 200) {
-                        this.$notify({
-                            title: '成功',
-                            message: '订单更新成功',
-                            type: 'success',
-                            duration: 2000
+            this.$refs.assetsForm.validate(valid => {
+                if (valid) {
+                    this.$confirm('是否确定要修改订单信息?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.$api.assets.update(this.assetsForm).then(res => {
+                            if (res.code === 200) {
+                                this.$notify({
+                                    title: '成功',
+                                    message: '订单更新成功',
+                                    type: 'success',
+                                    duration: 2000
+                                });
+                            }
+                        })
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消更新'
                         });
-                    }
-                })
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消更新'
-                });
-            });
+                    });
+                }
+            })
         }
-
     }
 }
 </script>
@@ -1351,5 +1358,4 @@ export default {
 
 /deep/.doWarehouseClass {
     border-radius: 10px;
-}
-</style>
+}</style>

src/views/assets/allList.vue

@@ -108,7 +108,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="80" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="text" @click="orderDetail(row)">查看</el-button>
                     </template>
                 </el-table-column>
             </parentTable>

src/views/assets/archivedList.vue

@@ -143,7 +143,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="80" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="text" @click="orderDetail(row)">查看</el-button>
                     </template>
                 </el-table-column>
             </parentTable>

src/views/assets/departmentDoneList.vue

@@ -87,7 +87,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="120" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="text" @click="orderDetail(row)">查看</el-button>
                     </template>
                 </el-table-column>
             </parentTable>

src/views/assets/departmentTodoList.vue

@@ -108,7 +108,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="100" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderViewDetail(row)">查看</el-button>
+                        <el-button type="text" @click="orderViewDetail(row)">查看</el-button>
                         <el-button v-if="row.handlerId === $store.getters.userInfo.id" type="danger" size="mini"
                             @click="orderDetail(row)">任务处理</el-button>
                     </template>

src/views/assets/doneList.vue

@@ -81,11 +81,11 @@
                         <el-tag v-if="row.instanceState === 'PENDING'" type="warning">进行中</el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="120" fixed="right">
+                <!-- <el-table-column label="操作" align="center" width="120" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="text" @click="orderDetail(row)">查看</el-button>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </parentTable>
         </y-page-list-layout>
     </div>

src/views/assets/orderDetail.vue

@@ -47,7 +47,8 @@
           <el-form ref="assetsForm" :model="assetsForm" :rules="assetsFormRules" :disabled="disabledStatus">
             <div class="createMajor-main-container">
               <div class="postInfo-container">
-                <el-row v-if="canUpdateOrderBaseInfoNode.includes(currentNode.nodeCode)" class="row-style" style="margin-top: 20px; float: right; position: relative; z-index: 2;">
+                <el-row v-if="canUpdateOrderBaseInfoNode.includes(currentNode.nodeCode)" class="row-style"
+                  style="margin-top: 20px; float: right; position: relative; z-index: 2;">
                   <el-col :xs="24" :sm="12" :lg="23" :span="12">
                     <el-button type="danger" @click="updateOrderBaseInfo()" round>更新基本信息</el-button>
                   </el-col>
@@ -719,8 +720,8 @@
                   </el-form>
                 </template>
               </el-table-column>
-              <el-table-column prop="id" label="id" width="120" align="center">
-              </el-table-column>
+              <!-- <el-table-column prop="id" label="id" width="120" align="center">
+              </el-table-column> -->
               <el-table-column prop="productionNo" label="产品号" align="center" show-overflow-tooltip>
                 <template slot-scope="{row}">
                   <el-tag type="success"><span>{{ row.productionNo }}</span></el-tag>
@@ -901,7 +902,8 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6"">
-                    <el-form-item label=" 产权持有人：" prop="theHolder" label-width="200px" class="postInfo-container-item">
+                        <el-form-item label=" 产权持有人：" prop="theHolder" label-width="200px"
+              class="postInfo-container-item">
               <el-input v-model="targetForm.theHolder" class="filter-item" style="width: 100%" />
               </el-form-item>
             </el-col>
@@ -1083,7 +1085,8 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog :visible.sync="productionWriteDialogVisible" @open="clearassetsProductionFormValidate()" @close="resetProductionForm()">
+    <el-dialog :visible.sync="productionWriteDialogVisible" @open="clearassetsProductionFormValidate()"
+      @close="resetProductionForm()">
       <el-form ref="assetsProductionForm" :model="assetsProductionForm" :rules="assetsProductionFormRules"
         :disabled="productionDisabledStatus">
         <div class="createMajor-main-container">
@@ -1244,24 +1247,24 @@
         <div class="createMajor-main-container">
           <div class="postInfo-container">
             <el-row>
-              <el-col :xs="12" :sm="12" :lg="12" :span="12">
-                <el-form-item label="评估方法：" prop="evaluationMethodId" label-width="120px" class="postInfo-container-item">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="评估方法：" prop="evaluationMethodId" label-width="190px" class="postInfo-container-item">
                   <el-select v-model="targetForm.evaluationMethodId" multiple style="width: 100%;">
                     <el-option v-for="(m, id) in assetsEvaluationMethod" :label="m.methodName" :value="m.id"
                       :key="m.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="12" :sm="12" :lg="12" :span="12" v-if="targetForm.evaluationMethodId.includes(7)">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="targetForm.evaluationMethodId.includes(7)">
                 <el-form-item prop="definedEvaluationMethod" label-width="20px" class="postInfo-container-item">
                   <el-input v-model="targetForm.definedEvaluationMethod" multiple style="width: 50%;">
                   </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="row-style">
-              <el-col :xs="12" :sm="12" :lg="12" :span="12">
-                <el-form-item label="最终选择的评估方法：" prop="choiceEvaluationMethodId" label-width="200px"
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="最终选择的评估方法：" prop="choiceEvaluationMethodId" label-width="190px"
                   class="postInfo-container-item">
                   <el-select v-model="targetForm.choiceEvaluationMethodId" multiple style="width: 100%;">
                     <el-option v-for="(m, id) in assetsEvaluationMethod" :label="m.methodName" :value="m.id"
@@ -1269,7 +1272,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="12" :sm="12" :lg="12" :span="12" v-if="targetForm.choiceEvaluationMethodId.includes(7)">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6" v-if="targetForm.choiceEvaluationMethodId.includes(7)">
                 <el-form-item prop="choiceDefinedEvaluationMethod" label-width="20px" class="postInfo-container-item">
                   <el-input v-model="targetForm.choiceDefinedEvaluationMethod" multiple style="width: 50%;">
                   </el-input>
@@ -1278,7 +1281,7 @@
             </el-row>
             <el-row>
               <el-col>
-                <el-form-item label="审核价格：" prop="checkValue" label-width="140px" class="postInfo-container-item">
+                <el-form-item label="审核价格：" prop="checkValue" label-width="190px" class="postInfo-container-item">
                   <el-input-number v-model="targetForm.checkValue" controls-position="right" :precision="2" :step="0.1"
                     :min="0"></el-input-number>
                   <span>（万）</span>
@@ -1450,6 +1453,7 @@
 import YDetailPageLayout from '@/components/YDetailPageLayout/index_detail'
 import WorkflowBoard from '@/components/workflowBoard'
 import ScanEntry from '@/components/ScanEntry'
+import { isNumber, phoneNumber, postiveInteger, isIdNumber } from '@/utils/validate'
 
 export default {
   name: 'AssetsOrderDetail',
@@ -1487,9 +1491,6 @@ export default {
       fileList: [],
       // 资产业务下单表单校验规则
       assetsFormRules: {
-        clientManager: [
-          { required: true, message: '客户经理不能为空', trigger: 'blur' }
-        ],
         departmentId: [
           { required: true, message: '请选择接单部门', trigger: 'change' }
         ],
@@ -1537,6 +1538,9 @@ export default {
         ],
         terminalClienteleContactId: [
           { required: true, message: '终端联系人不能为空', trigger: 'blur' }
+        ],
+        bailorContactTel: [
+          { required: false, validator: phoneNumber, trigger: 'blur' }
         ]
       },
       workflowLogs: [],
@@ -1948,10 +1952,10 @@ export default {
         ]
       },
       showDistributionButton: null,
-      canUpdateOrderBaseInfoNode:[
-        'DEPARTMENT_ALLOCATION','SPOT_RECONNAISSANCE_DETERMINE_PRICE','QUOTATION_FEEDBACK',
-        'PRODUCT_CHOICE','GENERATE_STATEMENT','REVIEW_STATEMENT','REEXAMINE_STATEMENT',
-        'WRITE_REPORT','CHECK_REPORT','RECHECK_REPORT','FOURTH_CHECK_REPORT'
+      canUpdateOrderBaseInfoNode: [
+        'DEPARTMENT_ALLOCATION', 'SPOT_RECONNAISSANCE_DETERMINE_PRICE', 'QUOTATION_FEEDBACK',
+        'PRODUCT_CHOICE', 'GENERATE_STATEMENT', 'REVIEW_STATEMENT', 'REEXAMINE_STATEMENT',
+        'WRITE_REPORT', 'CHECK_REPORT', 'RECHECK_REPORT', 'FOURTH_CHECK_REPORT'
       ]
     }
   },
@@ -1959,31 +1963,26 @@ export default {
 
   },
   created() {
-    this.disabledStatus = this.$route.query.disabledStatus === 'true';
-    this.couldEdit = this.$route.query.couldEdit === 'true';
-    this.couldBack = this.$route.query.couldBack === 'true';
-    if (this.$route.query.activeTabName !== null && this.$route.query.activeTabName !== undefined) {
-      this.activeTabName = this.$route.query.activeTabName;
-    }
-    this.nodeBusinessInfo.doWorkflow = true;
     // 获取页面参数
     this.pageParams.back = this.$route.query.back;
     this.pageParams.row = JSON.parse(this.$route.query.row);
-    this.getProductionTypes(this.pageParams.row.assetsId);
+    this.nodeBusinessInfo.doWorkflow = true;
     this.nodeBusinessInfo.mainBusiness = 'ASSET_BUSINESS';
     this.nodeBusinessInfo.businessId = this.pageParams.row.assetsId;
     this.nodeBusinessInfo.businessSubId = this.pageParams.row.statementNo;
     this.nodeBusinessInfo.businessMinId = this.pageParams.row.reportNo;
+    this.nodeBusinessInfo.reportNos.push(this.pageParams.row.statementNo);
+    this.disabledStatus = this.$route.query.disabledStatus === 'true';
+    this.couldEdit = this.$route.query.couldEdit === 'true';
+    this.couldBack = this.$route.query.couldBack === 'true';
+    if (this.$route.query.activeTabName !== null && this.$route.query.activeTabName !== undefined) {
+      this.activeTabName = this.$route.query.activeTabName;
+    }
     this.getCurrentNodeInfo();
     this.getAllotDepartment();
-    // this.getCustomerCompany(0);
-    // this.getCustomerCompany(1);
-    // this.getCustomerContract(0);
-    // this.getCustomerContract(1);
+    this.getProductionTypes(this.pageParams.row.assetsId);
     this.getAssetsDetailById(this.pageParams.row.assetsId);
-    // this.getProductionByBusinessId(this.pageParams.row.assetsId);
     this.getAETargetListByAssetsId();
-    this.nodeBusinessInfo.reportNos.push(this.pageParams.row.statementNo);
   },
   methods: {
     // 根据业务id获取资产业务详情
@@ -2102,28 +2101,6 @@ export default {
         }
         callback(verify);
       }
-      let specialNodesForReverse = ["GENERATE_STATEMENT", "WRITE_REPORT", "WRITE_LETTER"];
-      if (commit.state === 'REVERSE' && specialNodesForReverse.includes(this.currentNode.nodeCode)) {
-        this.$refs.board.getPreviousNode();
-        let reportNos = this.assetsEvaluationTarget.map(item => item.reportNo);
-        //取了子号不能退回节点
-        if (this.pNode.nodeCode === "QUOTATION_FEEDBACK" && reportNos[0].includes("-")) {
-          this.$notify({
-            title: '提示',
-            message: '该订单已取了其他子号，不能退回节点。',
-            type: 'info',
-            duration: 3000
-          });
-          verify.state = false;
-          verify.cleanReport = false;
-          callback(verify);
-        }
-        if (this.pNode.nodeCode === "QUOTATION_FEEDBACK" && !reportNos[0].includes("-")) {
-          verify.cleanReport = true;
-          callback(verify);
-        }
-        callback(verify);
-      }
     },
     goBack() {
       const back = this.$route.query.back
@@ -3519,38 +3496,42 @@ export default {
     },
     // 更新资产订单基本信息
     updateOrderBaseInfo() {
-      this.$confirm('是否确定要修改订单基本信息?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.assetsForm.members) {
-          this.assetsForm.members = JSON.stringify(this.assetsForm.members);
-        }
-        this.$api.assets.updateOrderBaseInfo(this.assetsForm).then(res => {
-          if (res.code === 200 && res.data) {
-            this.$notify({
-              title: '成功',
-              message: '订单基本信息更新成功！',
-              type: 'success',
-              duration: 3000
-            });
-            this.getAssetsDetailById(this.pageParams.row.assetsId);
-          } else {
-            this.$notify({
-              title: '失败',
-              message: '订单基本信息更新失败！请稍后重试！',
-              type: 'warning',
-              duration: 3000
+      this.$refs.assetsForm.validate(valid => {
+        if (valid) {
+          this.$confirm('是否确定要修改订单基本信息?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            if (this.assetsForm.members) {
+              this.assetsForm.members = JSON.stringify(this.assetsForm.members);
+            }
+            this.$api.assets.updateOrderBaseInfo(this.assetsForm).then(res => {
+              if (res.code === 200 && res.data) {
+                this.$notify({
+                  title: '成功',
+                  message: '订单基本信息更新成功！',
+                  type: 'success',
+                  duration: 3000
+                });
+                this.getAssetsDetailById(this.pageParams.row.assetsId);
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '订单基本信息更新失败！请稍后重试！',
+                  type: 'warning',
+                  duration: 3000
+                });
+              }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消更新'
             });
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消更新'
-        });
-      });
+          });
+        }
+      })
     }
   }
 

src/views/assets/terminateList.vue

@@ -103,8 +103,8 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="200" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="success" size="mini" @click="orderDetail(row)">查看</el-button>
-                        <el-button type="danger" size="mini" @click="toAddAssetsOrder(row)">重新下单</el-button>
+                        <el-button type="text" @click="orderDetail(row)">查看</el-button>
+                        <el-button type="text" @click="toAddAssetsOrder(row)">重新下单</el-button>
                     </template>
                 </el-table-column>
             </parentTable>

src/views/assets/todoList.vue

@@ -104,7 +104,7 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="120" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button type="danger" size="mini" @click="orderDetail(row)">任务处理</el-button>
+                        <el-button type="text" @click="orderDetail(row)">任务处理</el-button>
                     </template>
                 </el-table-column>
             </parentTable>

src/views/complex/index.vue

@@ -477,7 +477,7 @@
           </el-tab-pane>
           <el-tab-pane name="assets" v-if="meunNames.includes('资产业务')">
             <span slot="label">资产待办({{ assetsTodoTotal }})</span>
-            <div v-if="assetsTodoList.records.length>0">
+            <div v-if="assetsTodoList.length > 0">
               <div style="margin-top: 1%; margin-bottom: 2%;">
                 <svg t="1713513294985" class="icon" viewBox="0 0 1024 1024" version="1.1"
                   xmlns="http://www.w3.org/2000/svg" p-id="11577" id="mx_n_1713513294986" width="15" height="15">
@@ -491,7 +491,7 @@
                     class="el-icon-arrow-right el-icon--right"></i></el-button>
               </div>
               <div class="left-content">
-                <parentTable ref="table" v-loading="listLoading" :data="assetsTodoList.records" slot="table" stripe border
+                <parentTable ref="table" v-loading="listLoading" :data="assetsTodoList" slot="table" stripe border
                   :isBoard=450 style="width: 100%;">
                   <el-table-column label="项目编号" align="center" width="150">
                     <template slot-scope="{row}">
@@ -790,8 +790,8 @@ export default {
       keyword: null,
       searchResults: [],
       hasOpenBar: false,
-      ifMajorDeclareCheck:false,
-      ifAssetsDeclareCheck:false,
+      ifMajorDeclareCheck: false,
+      ifAssetsDeclareCheck: false,
       maxTagKey: null
     }
   },
@@ -803,10 +803,10 @@ export default {
 
   },
   watch: {
-    majorTodoTotal:{
+    majorTodoTotal: {
       immediate: true,
       handler(newv) {
-          this.getToDoMaxNum();
+        this.getToDoMaxNum();
       }
     },
     permission_menus: {
@@ -816,20 +816,20 @@ export default {
         this.meunNames = this.permission_menus.map(item => item.name);
         const admin = this.permission_menus.filter(item => item.pcUrl === '/administration');
         if (admin.length > 0) {
-          const adminType =admin[0].children.map(item => {
+          const adminType = admin[0].children.map(item => {
             return item.menuCode;
           });
 
-            if (adminType.includes('_views_administration_major_declare_check_list')) {
-              this.ifMajorDeclareCheck = true;
-            }
-            if (adminType.includes('_views_administration_assets_declare_check_list')) {
-              this.ifAssetsDeclareCheck = true;
-            }
+          if (adminType.includes('_views_administration_major_declare_check_list')) {
+            this.ifMajorDeclareCheck = true;
+          }
+          if (adminType.includes('_views_administration_assets_declare_check_list')) {
+            this.ifAssetsDeclareCheck = true;
+          }
         }
       }
     },
-  
+
     keyword: {
       handler(newv) {
         if (newv) {
@@ -872,20 +872,20 @@ export default {
   methods: {
     handleClick(tab, event) {
     },
-    getToDoMaxNum(){
-        const maxTodo = new Map();
-        maxTodo.set("major", this.majorTodoTotal);
-        maxTodo.set("personal", this.personalTodoTotal);
-        maxTodo.set("assets", this.assetsTodoTotal);
-        maxTodo.set("majorCheck", this.majorDeclareCheckNum);
-        maxTodo.set("assetsDeclareCheckList", this.assetsDeclareCheckNum);
-        let maxKey = [...maxTodo.entries()].reduce((maxKey, [key, value]) => {
-          return maxKey && maxTodo.get(maxKey) > value ? maxKey : key;
-        }, 0);
-        this.maxTagKey = maxKey;
+    getToDoMaxNum() {
+      const maxTodo = new Map();
+      maxTodo.set("major", this.majorTodoTotal);
+      maxTodo.set("personal", this.personalTodoTotal);
+      maxTodo.set("assets", this.assetsTodoTotal);
+      maxTodo.set("majorCheck", this.majorDeclareCheckNum);
+      maxTodo.set("assetsDeclareCheckList", this.assetsDeclareCheckNum);
+      let maxKey = [...maxTodo.entries()].reduce((maxKey, [key, value]) => {
+        return maxKey && maxTodo.get(maxKey) > value ? maxKey : key;
+      }, 0);
+      this.maxTagKey = maxKey;
     },
     jumpDir(path) {
-      if (path==='/administration'){
+      if (path === '/administration') {
         const admin = this.permission_menus.filter(item => item.pcUrl === path);
         path = admin[0].children[0].pcUrl;
       }
@@ -913,8 +913,7 @@ export default {
       }
       this.$api.assets.selectPage(listQuery).then(res => {
         if (res.code === 200) {
-          this.assetsTodoList = res.data;
-          console.log(res.data);
+          this.assetsTodoList = res.data.records;
         }
       })
     },
@@ -982,7 +981,21 @@ export default {
     },
     assetsToDo(row) {
       if (row.currentNodeCode === 'REPORT_OUT_APPLY') {
-        this.$router.push(`/assets/myOrderList`)
+        const newRow = {
+          reportNo: row.reportNo,
+          statementNo: row.statementNo,
+          businessType: 'ASSET_BUSINESS',
+          assetsId: row.assetsId,
+          recordId: row.recordId,
+          currentNodeId: row.currentNodeId
+        }
+        this.$router.push({
+          path: `/assets/myOrderList`,
+          query: {
+            repertoryOutWarehouseVisible: true,
+            row: JSON.stringify(newRow)
+          }
+        })
         return;
       } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
         this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)
@@ -1016,7 +1029,7 @@ export default {
         this.$router.push({
           path: "/assets/orderDetail",
           query: {
-            row: JSON.stringify(row),
+            row: JSON.stringify(newRow),
             back: '/assets/todoList',
             couldEdit: true,
             couldBack: true,