bug修复
This commit is contained in:
		
							parent
							
								
									bb84f4b136
								
							
						
					
					
						commit
						207865f79a
					
				| 
						 | 
					@ -131,15 +131,11 @@
 | 
				
			||||||
                                </span>
 | 
					                                </span>
 | 
				
			||||||
                                <span v-if="orderStatus == 20">
 | 
					                                <span v-if="orderStatus == 20">
 | 
				
			||||||
                                    {{
 | 
					                                    {{
 | 
				
			||||||
                                        momentInit(goods.takeOverTime).diff(
 | 
					                                        isNaN(momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day'))
 | 
				
			||||||
                                            goods.rentOverTime,
 | 
					                                            ? '-'
 | 
				
			||||||
                                            'day',
 | 
					                                            : momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day') == 0
 | 
				
			||||||
                                        ) == 0
 | 
					 | 
				
			||||||
                                            ? 1
 | 
					                                            ? 1
 | 
				
			||||||
                                            : momentInit(goods.takeOverTime).diff(
 | 
					                                            : momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day')
 | 
				
			||||||
                                                  goods.rentOverTime,
 | 
					 | 
				
			||||||
                                                  'day',
 | 
					 | 
				
			||||||
                                              )
 | 
					 | 
				
			||||||
                                    }}{{ ' ' + '天' }}
 | 
					                                    }}{{ ' ' + '天' }}
 | 
				
			||||||
                                </span>
 | 
					                                </span>
 | 
				
			||||||
                            </el-col>
 | 
					                            </el-col>
 | 
				
			||||||
| 
						 | 
					@ -188,9 +184,8 @@
 | 
				
			||||||
                            style="font-weight: bold; margin-top: 10px"
 | 
					                            style="font-weight: bold; margin-top: 10px"
 | 
				
			||||||
                            v-if="orderStatus == 20"
 | 
					                            v-if="orderStatus == 20"
 | 
				
			||||||
                        >
 | 
					                        >
 | 
				
			||||||
                            {{ goods.takeOverTime.slice(0, 10) }}至{{
 | 
					                            {{ goods.takeOverTime ? goods.takeOverTime.slice(0, 10) : '' }}至
 | 
				
			||||||
                                goods.rentOverTime.slice(0, 10)
 | 
					                            {{ goods.rentOverTime ? goods.rentOverTime.slice(0, 10) : '' }}
 | 
				
			||||||
                            }}
 | 
					 | 
				
			||||||
                        </div>
 | 
					                        </div>
 | 
				
			||||||
                    </div>
 | 
					                    </div>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
| 
						 | 
					@ -234,7 +229,7 @@
 | 
				
			||||||
                <el-table-column prop="days" align="center" label="租赁天数" />
 | 
					                <el-table-column prop="days" align="center" label="租赁天数" />
 | 
				
			||||||
                <el-table-column prop="days" align="center" label="租期">
 | 
					                <el-table-column prop="days" align="center" label="租期">
 | 
				
			||||||
                    <template #default="{ row }">
 | 
					                    <template #default="{ row }">
 | 
				
			||||||
                        {{ `${row.preOutboundTime}至${row.rentOverTime} ` }}
 | 
					                        {{ `${row.preOutboundTime}至${row.rentOverTime || ''} ` }}
 | 
				
			||||||
                    </template>
 | 
					                    </template>
 | 
				
			||||||
                </el-table-column>
 | 
					                </el-table-column>
 | 
				
			||||||
                <el-table-column prop="costs" align="center" label="租赁费用(元)" width="160">
 | 
					                <el-table-column prop="costs" align="center" label="租赁费用(元)" width="160">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue