订单详情服务商列表调整

src/views/ordermanager/modules/HwOrderModal.vue

@@ -56,16 +56,37 @@
             :pagination="pagination"
             :dataSource="dataSource"
             :loading="loading"
-            :rowClassName="getRowClassname"
             @change="handleTableChange">
 
-            <span slot="workContract" slot-scope="text, record">
-              <template>
-                <span>{{record.isWorkContract ? '已上传':'未上传'}}</span>
-                <span>{{record.isPayment ? '':'  (未走款)'}}</span>
-                <a-icon type="upload" :style="{color:'#8e8e8e'}" title="点击上传" @click="uploadWorkContract(record)" style="margin-left: 8px" />
+            <span slot="endDate" slot-scope="text, record">
+              <template v-if="record.isAutoRenew === 0 && text">
+                <template v-if="record.contractStatus == 1">
+                  <span style="color: #FF7312">{{text.substring(0,10)}}(即将到期)</span>
+                </template>
+                <template v-else-if="record.contractStatus == 2">
+                  <span style="color: #F01B1B">{{text.substring(0,10)}}(已到期)</span>
+                </template>
+                <template v-else>
+                  {{text.substring(0,10)}}
+                </template>
+              </template>
+              <template v-else>
+                 --
+              </template>
+            </span>
+
+            <span slot="isPayment" slot-scope="text, record">
+              <template v-if="record.isPayment">
+                已走款：{{record.minPaymentTime.substring(0,10)}}~{{record.maxPaymentTime.substring(0,10)}}
+              </template>
+              <template v-else>
+                未走款
               </template>
             </span>
+
+            <span slot="workContract" slot-scope="text, record">
+              <a @click="uploadWorkContract(record)" >{{record.workContract ? '已上传':'未上传'}}</a>
+            </span>
           </a-table>
 
         </detail-list>
@@ -149,6 +170,26 @@
             dataIndex: 'name',
           },
           {
+            title: '合同开始时间',
+            align: 'left',
+            dataIndex: 'startDate',
+            customRender:function (text) {
+              return text ? text.substring(0,10) : "--";
+            }
+          },
+          {
+            title: '合同结束时间',
+            align: 'left',
+            dataIndex: 'endDate',
+            scopedSlots: { customRender: 'endDate' }
+          },
+          {
+            title: '走款情况',
+            align: 'left',
+            dataIndex: 'isPayment',
+            scopedSlots: { customRender: 'isPayment' }
+          },
+          {
             title: '用户合同',
             align: 'left',
             width: 200,
@@ -431,11 +472,6 @@
         }
         return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
       },
-      getRowClassname(record){
-        if(!record.isPayment){
-          return "payFail"
-        }
-      },
       //上传用户合同
       uploadWorkContract(record){
         this.$refs.modalSelectForm.edit(record, this.model)