1.资产相关页面优化

2.修复资产市场分管副总审批提成404

src/views/administration/assets/checkList.vue

@@ -158,7 +158,7 @@ export default {
         },
         checkDetail(row) {
             let backPath = '/administration/assets/declare/check/list';
-            this.$router.push(`/income/assets/declare/detail?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}&couldEdit=${true}`)
+            this.$router.push(`/administration/assets/declare/check?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}&couldEdit=${true}`)
         }
     }
 

src/views/assets/allList.vue

@@ -78,12 +78,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前节点" align="center" width="150">
@@ -98,7 +98,7 @@
                 </el-table-column>
                 <el-table-column label="项目负责人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.principalName }}</span>
+                        <span>{{ row.principalName == null ? '-' : row.principalName }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="客户经理" align="center" width="150">

src/views/assets/archivedList.vue

@@ -78,12 +78,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前节点" align="center" width="150">
@@ -118,27 +118,27 @@
                 </el-table-column>
                 <el-table-column label="订单应收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.shouldAmount }}</span>
+                        <span>{{ row.shouldAmount == null ? '-' : row.shouldAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="订单实收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.realAmount }}</span>
+                        <span>{{ row.realAmount == null ? '-' : row.realAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="标准收费(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.standardAmount }}</span>
+                        <span>{{ row.standardAmount == null ? '-' : row.standardAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="折扣比例" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.discount }}</span>
+                        <span>{{ row.discount == null ? '-' : row.discount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="实际开票金额" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.invoiceRealAmount }}</span>
+                        <span>{{ row.invoiceRealAmount == null ? '-' : row.invoiceRealAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="80" fixed="right">

src/views/assets/departmentDoneList.vue

@@ -56,7 +56,7 @@
                 </el-table-column>
                 <el-table-column label="处理意见" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.comments }}</span>
+                        <span>{{ row.comments == null ? '-' : row.comments }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作状态" align="center" width="150">

src/views/assets/departmentTodoList.vue

@@ -78,12 +78,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前节点" align="center" width="150">

src/views/assets/doneList.vue

@@ -52,7 +52,7 @@
                 </el-table-column>
                 <el-table-column label="处理意见" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.comments }}</span>
+                        <span>{{ row.comments == null ? '-' : row.comments }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作状态" align="center" width="150">

src/views/assets/myOrderList.vue

@@ -72,12 +72,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前节点" align="center" width="150">
@@ -102,42 +102,42 @@
                 </el-table-column>
                 <el-table-column label="评估结论对应的评估值(万)" align="center" width="200">
                     <template slot-scope="{row}">
-                        <span>{{ row.estimatedValue }}</span>
+                        <span>{{ row.estimatedValue == null ? '-' : row.estimatedValue }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="订单应收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.shouldAmount }}</span>
+                        <span>{{ row.shouldAmount == null ? '-' : row.shouldAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="订单实收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.realAmount }}</span>
+                        <span>{{ row.realAmount == null ? '-' : row.realAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="产品应收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.productionShouldAmount }}</span>
+                        <span>{{ row.productionShouldAmount == null ? '-' : row.productionShouldAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="产品实收款(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.productionRealAmount }}</span>
+                        <span>{{ row.productionRealAmount == null ? '-' : row.productionRealAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="标准收费(元)" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.standardAmount }}</span>
+                        <span>{{ row.standardAmount == null ? '-' : row.standardAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="折扣比例" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.discount }}</span>
+                        <span>{{ row.discount == null ? '-' : row.discount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="实际开票金额" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.invoiceRealAmount }}</span>
+                        <span>{{ row.invoiceRealAmount == null ? '-' : row.invoiceRealAmount }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="送达状态" align="center" width="150">

src/views/assets/terminateList.vue

@@ -73,12 +73,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目负责人" align="center" width="150">
@@ -98,7 +98,7 @@
                 </el-table-column>
                 <el-table-column label="终止原因" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.comment }}</span>
+                        <span>{{ row.comment == null ? '-' : row.comment }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="200" fixed="right">

src/views/assets/todoList.vue

@@ -74,12 +74,12 @@
                 </el-table-column>
                 <el-table-column label="委托人" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailor }}</span>
+                        <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="委托人联系电话" align="center" width="150">
                     <template slot-scope="{row}">
-                        <span>{{ row.bailorContactTel }}</span>
+                        <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前节点" align="center" width="150">

src/views/finance/settleAssets.vue

@@ -34,34 +34,34 @@
                         </el-button>
                     </template>
                     <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
-                        <el-table-column label="项目编号" width="110" align="center">
+                        <el-table-column label="项目编号" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.orderId }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="产品号" width="200" align="center">
+                        <el-table-column label="产品号" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.productionNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="结算日期" width="100" align="center">
+                        <el-table-column label="结算日期" align="center">
                             <template slot-scope="{row}">
                                 <span style="color:red">{{ row.settleDate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="认领日期" width="100" align="center">
+                        <el-table-column label="认领日期" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.claimDate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="归档日期" width="100" align="center">
+                        <el-table-column label="归档日期" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.saveFileDate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
+                        <el-table-column label="项目名称" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
-                                <span>{{ row.name }}</span>
+                                <span>{{ row.projectName }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="客户名称" align="center">
@@ -74,7 +74,7 @@
                                 <span>{{ row.clientSubName }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="委托方" width="200" align="center">
+                        <el-table-column label="委托方" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.bailor }}</span>
                             </template>