Commit 578cc7fc authored by youjie's avatar youjie

no message

parent 1288130e
...@@ -716,7 +716,10 @@ ...@@ -716,7 +716,10 @@
<span class="text-grey-6">{{item.PetitionId}}</span> <span class="text-grey-6">{{item.PetitionId}}</span>
</span> </span>
</div> </div>
<span> {{$t('objFill.guestinfor')}}:<span class="cblack">{{item.CustomerName}}</span> <span v-if="item.CustomerName||item.CustomerTel">
<template v-if="item.CustomerName">
{{$t('objFill.guestinfor')}}<span class="cblack">{{item.CustomerName}}</span>
</template>
<span v-if="item.CustomerTel">/ Tel:<span class="cblack">{{ item.CustomerTel }}</span> </span> <span v-if="item.CustomerTel">/ Tel:<span class="cblack">{{ item.CustomerTel }}</span> </span>
<!-- <span v-if="item.CustomerMail">/ Email: <!-- <span v-if="item.CustomerMail">/ Email:
<span class="cblack">{{chind.CustomerMail}}</span> </span> --> <span class="cblack">{{chind.CustomerMail}}</span> </span> -->
...@@ -739,14 +742,18 @@ ...@@ -739,14 +742,18 @@
</div> </div>
<el-table :data="[item]" style="width:100%" border> <el-table :data="[item]" style="width:100%" border>
<el-table-column label="司机" min-width="180" style="background:#EAEAEA"> <el-table-column label="司机" min-width="220" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.DriverModel"> <div v-if="scope.row.DriverModel">
{{ scope.row.DriverModel.DriverName }}/{{ scope.row.DriverModel.DriverTel }} {{ scope.row.DriverModel.DriverName }}/{{ scope.row.DriverModel.DriverTel }}
</div> </div>
<span
v-if="scope.row.CopilotDriverModel">
{{$t('objFill.assistantdriver')}}{{scope.row.CopilotDriverModel.DriverName}}/{{scope.row.CopilotDriverModel.DriverTel}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="150" style="background:#EAEAEA"> <el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="180" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.CarModel"> <div v-if="scope.row.CarModel">
{{ scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }} {{ scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }}
...@@ -762,8 +769,8 @@ ...@@ -762,8 +769,8 @@
<span class="mr"> <span class="mr">
{{x.useDate}} {{x.useDate}}
</span> </span>
<span class="mr" <!-- <span class="mr"
v-if="x.CopilotDriverModel">{{$t('objFill.assistantdriver')}}{{x.CopilotDriverModel.DriverName}}/{{x.CopilotDriverModel.DriverTel}}</span> v-if="x.CopilotDriverModel">{{$t('objFill.assistantdriver')}}{{x.CopilotDriverModel.DriverName}}/{{x.CopilotDriverModel.DriverTel}}</span> -->
<span class="ml"> {{ x.useTypeInfo.StatusName }} </span> <span class="ml"> {{ x.useTypeInfo.StatusName }} </span>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment