个贷优化1

src/views/complex/index.vue

@@ -410,17 +410,17 @@
                   </el-table-column>
                   <el-table-column label="面积" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.acreage }}</span>
+                      <span>{{ row.acreage? row.acreage : '-' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="单价" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.price }}</span>
+                      <span>{{ row.price? row.price : '-' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="总价" align="center" width="130">
                     <template slot-scope="{row}">
-                      <span>{{ row.amount }}</span>
+                      <span>{{ row.amount? row.amount : '-' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="客户名称" align="center" width="130">
@@ -830,6 +830,18 @@ export default {
         this.getToDoMaxNum();
       }
     },
+    personalTodoTotal: {
+      immediate: true,
+      handler(newv) {
+        this.getToDoMaxNum();
+      }
+    },
+    assetsTodoTotal: {
+      immediate: true,
+      handler(newv) {
+        this.getToDoMaxNum();
+      }
+    },
     permission_menus: {
       immediate: true, // immediate选项可以开启首次赋值监听
       deep: true,

src/views/major/myOrderDetail.vue

@@ -6,7 +6,8 @@
      <el-tabs v-model="activeTagName" @tab-click="handleClick" type="border-card">
       <el-tab-pane name="order" class="pane-class" :lazy=true>
         <span slot="label"><i class="el-icon-document"></i> 市场订单</span>
-        <y-detail-page-layout ref="myOrder"  @save="handleCreate" :editStatus="couldEdit" @doRecall="doRecall" :couldBack="couldBack">
+        <y-detail-page-layout ref="myOrder"  @save="handleCreate" :editStatus="couldEdit" 
+          @doRecall="doRecall" :couldBack="couldBack">
           <div>
             <el-form ref="majorForm" :model="major" class="form-container">
               <div class="createMajor-main-container">

src/views/personal/myOrder.vue

@@ -421,7 +421,7 @@ export default {
     },
 
     orderDetail(row){
-      this.$router.push(`/personal/order?id=${row.id}&couldEdit=${false}&recall=${true}$couldBack=${true}&back=${'/personal/my/order'}`)
+      this.$router.push(`/personal/order?id=${row.id}&couldEdit=false&recall=true&couldBack=true&back=${'/personal/my/order'}`)
     },
     productionList(id){
       this.productionListDialog = true;

src/views/personal/pendingList.vue

@@ -8,12 +8,12 @@
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery"></MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="项目编号" align="center" width="200" >
+        <el-table-column label="项目编号" align="center" width="150" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="坐落" align="center" width="150">
+        <el-table-column label="坐落" align="center" width="200">
           <template slot-scope="{row}">
             <span>{{ row.location }}</span>
           </template>
@@ -105,7 +105,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot-scope="{row}">
-            <el-button round type="primary" @click="orderDetail(row)">详情</el-button>
+            <el-button type="text" @click="orderDetail(row)">详情</el-button>
           </template>
         </el-table-column>
       </parentTable>

src/views/personal/todoDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-collapse v-model="activeName" @change="handleChange">
-      <el-collapse-item>
+    <el-collapse v-model="activeName" @change="handleChange" accordion>
+      <el-collapse-item name="workflowBoard">
         <template slot="title">
           <span style="font-size:20px; margin-left:20px;letter-spacing:2px;color:red">
             <i class="el-icon-warning"></i>
@@ -1081,7 +1081,7 @@ export default {
         ],
       },
       workflowLogs: [],
-      activeName: 'workflowInfo',
+      activeName: null,
       activeTagName: null,
       nodeBusinessInfo: {
         currentNodePermission: {
@@ -1602,8 +1602,10 @@ export default {
         }
       }
     },
-    handleChange() {
-
+    handleChange(tab) {
+      if (this.outwardStaffTip) {
+        this.outwardStaffTip = false;
+      }
     },
     goBack() {
       const back = this.$route.query.back

src/views/personal/todoList.vue

@@ -13,7 +13,7 @@
             <span>{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" width="140" >
+        <el-table-column label="项目编号" align="center" width="150" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
@@ -30,17 +30,17 @@
         </el-table-column>
         <el-table-column label="面积" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.acreage }}</span>
+            <span>{{ row.acreage? row.acreage: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.price }}</span>
+            <span>{{ row.price? row.price: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.amount }}</span>
+            <span>{{ row.amount? row.amount: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width="130">
@@ -85,7 +85,7 @@
         </el-table-column>
         <el-table-column label="实勘人" align="center" width="130">
           <template slot-scope="{row}">
-            <span>{{ row.outwardStaffName }}</span>
+            <span>{{ row.outwardStaffName? row.outwardStaffName: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="内业人员" align="center" width="130">