Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/market/payment/list.vue

@@ -173,14 +173,15 @@
             </el-button>
           </template>
           <parentTable v-loading="listLoading" :data="pageXData.records" slot="table" style="width: 100%;">
-            <el-table-column label="项目名称" align="center" show-overflow-tooltip >
+           
+            <el-table-column label="项目编号" align="center" width="150">
               <template slot-scope="{row}">
-                <span>{{ row.itemName }}</span>
+                <span>{{ row.businessNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="事业部流水号" align="center" width="150">
+            <el-table-column label="项目名称" align="center" show-overflow-tooltip >
               <template slot-scope="{row}">
-                <span>{{ row.businessNo }}</span>
+                <span>{{ row.itemName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="项目类型" align="center" >
@@ -188,19 +189,14 @@
                 <span>{{ row.cateName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="业务来源" align="center" >
+            <el-table-column label="市场部" align="center" >
               <template slot-scope="{row}">
-                <span>{{ row.businessSource }}</span>
+                <span>{{ row.marketDepartment }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="委托单位" align="center">
+            <el-table-column label="评估部" align="center" >
               <template slot-scope="{row}">
-                <span>{{ row.clientUnit }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="客户名字" align="center" >
-              <template slot-scope="{row}">
-                <span>{{ row.clientName }}</span>
+                <span>{{ row.evaluateDepartment }}</span>
               </template>
             </el-table-column>
             <el-table-column label="客户经理" align="center" >
@@ -208,25 +204,29 @@
                 <span>{{ row.clientManager }}</span>
               </template>
             </el-table-column>
-           
             <el-table-column label="负责人" align="center" >
               <template slot-scope="{row}">
                 <span>{{ row.skiller }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="回款名称" align="center" >
+            <el-table-column label="参与人" align="center" >
               <template slot-scope="{row}">
-                <span>{{ row.name }}</span>
+                <span>{{ row.joiner }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款方" align="center" >
+            <el-table-column label="到账日期" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.payer }}</span>
+                <span>{{ row.payDatetime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="到账日期" align="center">
+            <el-table-column label="认领时间" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.payDatetime }}</span>
+                <span>{{ row.paymentDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="认领人" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.claimUser }}</span>
               </template>
             </el-table-column>
             <el-table-column label="认领金额" align="center" >
@@ -234,14 +234,29 @@
                 <span style="color: red;">{{ row.claimAmount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="认领人" align="center">
+            <el-table-column label="回款名称" align="center" >
               <template slot-scope="{row}">
-                <span>{{ row.claimUser }}</span>
+                <span>{{ row.name }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="认领日期" align="center">
+            <el-table-column label="付款方" align="center" >
               <template slot-scope="{row}">
-                <span>{{ row.paymentDate }}</span>
+                <span>{{ row.payer }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名字" align="center" >
+              <template slot-scope="{row}">
+                <span>{{ row.clientName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="业务来源" align="center" >
+              <template slot-scope="{row}">
+                <span>{{ row.businessSource }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="委托单位" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.clientUnit }}</span>
               </template>
             </el-table-column>
           </parentTable>